Add GA + small fixes