fix bugs and google analytics