Javadoc and some getters/setters