Increased ping interval, better clean-up