Fixed analytics and updated starting puush (really need to find a way around this)