fixes and analytics