Big Fix
Hopefully done for a while with organizing

Lots of moving things into the JSON array instead of extra code
Missing Commas
Merge remote-tracking branch 'origin/master' into Chrome