Added javadocs

Other minor additions