Poller fixes, many updates!