feedback changes and fixes
Bug fixes