fixing a lot of shit
Merge branch 'master' of github.com:clickbeetle/cb_overlay