FIX fixing yet more issues with atom:updated, and a couple smaller ones