Cleaned code, updated GA for async, added event tracking