Rewrote poller runner
Fixed a few typos