Feature/rd fixes

this pull request resolves 8 stories from sprint 19.