Cleanup weird things

- Removed System.out.println()
- Some javadocs cleanups
(but maybe @stephenc has a strong opinion one way or the other)