implementing features and fixes as requested from user testing