Fixing escape error
Final commit of escape error
Small header fix