qa feedback and fixes