fixed some async issues and getting events from actual api