#118 analyics improvements