Many fixes and CORRECTION of analytics!