am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit '7ea69880bdbf2c51140460dcfd063dc015c3ce26':
  Improve some docs, fix some debugging.