Updated JSON parser and supporting classes; cleaning up project left overs