Merge pull request #373 from melissalinkert/sprint5-bug-fixes

Sprint5 bug fixes