fixing import and javadocs