Mostly improved Javadoc

Some other minor code style cleanup