General code, javadoc and encapsulation reviewed.