Add better status tracking and catching of Esc