Misc changes, hitting escape now clears the DOM