Misc. manager changes.
Merge branch 'master' of github.com:pdabbadabba/Beatdown