Minor fixes, add tracking with google analytics