Fixed all errors found in demo

Double checked, and super duper done. DONE

I SAAAIIIDD DONNNEE :ambulance: