fix ssh polling, bring in unrelated stuff ...