Merge "Improve some docs, fix some debugging." into lmp-dev