adding more stuff, fixing GA