updates to code based on Katwa user testing