More escapes and a sneaky cleanup