Added javadoc comments

Only where useful/necessary