add qualifier
minor optimization
javadoc
javadoc