doc update
doc additions
fix a bunch of post editing bugs - though this consolidates some disparate code and may create some new bugs due to regression
Merge remote-tracking branch 'upstream/master'
Let's start getting this ready then.