Javadoc warning fixes, added javadoc