Cont'd review and JavaDoc-ing it a bit; relates to #240 #192