changes
more parsing code.
trim added
custom json
custom json
minor changes to parsing.
fixes merge conflict with makejson branch