#149 fix some javadoc and compiler warnings

I understand the change, but do these make future merges on this source harder? @chrisdennis  @alexsnaps  ?