Bug fixing
Analytics improvements