Temporarily deleting Javadoc
Various improvements
Adding some code to help with documentation