more changes

hooked up the new json parser to settings, cleaned up some of the code