+ fix eval test
+ fix header processing
+ add some javadoc