Minor changes
numerous changes, most notably proper indent/dedent recognition and string recognition (though not capturing)