to json improvements all the way through
removed some extra code that was unneeded