feedback fixes

feedback from end user