clarified some javadoc and code comment, renamed module name,