Trunk dev guide updates and fixes

Hi Rich. This branch is deconflicted with master. Thanks.