Fixed some performance thingies
Merge branch 'master' of github.com:Meraz/thorbear