feedback and other changes