google analytics and minor cleanup