fixed analytics
tweaks from review