Escape missing
Removed an error message, added one
Cleanup
Ergonomy bug
Some more cleanup