Feature/nearby polling bugs

Fixes #63