Full JavaDoc and Minor BugFixes