Discovered a couple of more edge case bugs in the TUI project. Working on them today.#