don't break things on clean-up and add some more data fields for articles