Added javadoc comments/small edits