More Javadoc Fixes
-- Again, sorry about merge conflicts