fixed stop issues und event manager