Doc additions and some cleanup