Nice! This includes some fixes of my own, to dispel the notion I don't pull as well ;)