fix two major bug in feature extraction, but not big improvement
simplify features