Added some comments

and javadocs