fixing lingering things