bigger trash cans
buffer bar fix
Merge branch 'master' of github.com:teabait/batman into t