Added more javadoc and ...

cleaned up imports.