completely redoing EPOLL; reordered parts of file