Fix/Add javadoc comments