adding GA and small changes required for publishing