Bug Fixes

Fixed issues with quotes and nulls in the JSON.