Switch cnt/set to polling. Minor tweaks for usability.