Added new comments and javadoc comments. Edited old javadoc comments