javadocs added and some small fixses
javadocs added and some small fixses