Adding in GA code, fixing a couple of minor bugs
1.0.0