Merge pull request #60 from jitlogic/fixes

Fixes
Further fixes and cleanups (mostly javadocs).