Changes and corrections for 00-who

I think this version looks nicer.