Updated Comments and javadocs