minor fixes to tourMap and parse, input no longer requires newline