new upoll-based scheduler and various fixes
binary merge conflict