Setters and some javadoc implemented