Properly clean up closed batchers

Misc other bug-fixes and refactors