#118 analytics improvements