Added and updated javadoc for several classes