Combined indentation and misc. fixes.
Added a couple of error tests to check lexical errors.