removed auto-header, added javadocs