Fix one place that needs to handle new multi-char buffer
Fix cursors getting out of sync when entering/exiting insert mode

Also simplify revert_mode function