Fixed up the analytics