Small improvements + analytics