initial cleanup -sG
Updating everything for Gold, adding some tiny perfopts, need to do a little bit of re-arching on a few things still -sG