Few more minor tweaks including analytics