removed ignorables
Fixed bugs