fixes in feature