Further fixes and cleanups (mostly javadocs).
Merge pull request #61 from jitlogic/fixes

Further fixes and cleanups (mostly javadocs).