added stemming, fix merge error
make step improvements