change the unknown value handling
clarify javadoc
fix imports