another pull after some more db cleaning, this is fun