modification of features & cleanup