Various fixes sorry it's crunch time I can't come up with a descriptive commit message
Merge branch 'master' of github.com:rajunc/NewsRoom