Javadoc for nice methods
Mark 'stateless'
Improve error reporting