more commenting and Javadoc