Cleaned code, change to GA async, added event tracking