Fixing up Javadoc Warnings
Merge branch 'javadocfix'