everything done but javadoc and deleting useless comments