friday fixes

dr fridays fixes
Merge pull request #8 from watshisface/master

friday fixes