little more defensive
take a copy
be more aggressive about cleanup