Improve analytics, fix tw/facebook error