Added and fixed javadocs