cleanup watchpoll code, document it, update icon