Various Fixes and Javadoc Jar