More Javadocing around the place, also add various todo notes for later
Merge remote-tracking branch 'origin/master'