added some comments / Javadoc