added some getters/setters and javadoc comments