fixes and QA items