Various cleanup, some javadoc improvements, etc.