Fix and make features simpler.