refactor sibling polling
fix yardstick dependency
fix documentation
refactor some more