Added Escape Hatch and some clean up