JavaDocs and misc cleanup
Misc work