cleanups + renaming members
added google analytics events