Minor tweaks (now false objects never get removed)