Minor bug fixes, plus escape added