edited header comments / fixed javadoc