fix emails + analytics