A few more exceptions and support for JSON parsing
Some whitespace issues