Added some more javadoc comments and cleaned up imports