move to its own GA tracker, fixed two exceptions