starting to fix polling
re-ran all tests & nose tests for final code review changes