analytics and minor tweaks