Add epoll + other changes