Added Comments, and javadoc