No, really, I've finally fixed it all.  Probably.