minor changes, some javadoc comments.