Refactoring to simplify UpdateTerminal
Fixes for multihack. Should update currently focused buffer now.
Removed TODO for most recent fix