cpoll: eliminate extraneous dispatch() calls under all conditions
misc

* update makefile
* misc minor bugfixes and changes