major corrections for event manager and tcp