fixes & google analytics