Fixed a few minor issues. removed unfinishable work
Generated javadoc