Bug fixes, google analytics added