add javadoc, expand in comments