Ok, done! Sorry it was such a raw mess to begin with. I haven't done this sort of thing much. Or at all.