poll fixes + perf work.