feedback and fixes