Fixes and loads od stuff
Merge branch 'master' of https://github.com/HerrBen/YRS-2014---Cyber-Duck