Added several Javadoc comments, not all