Lots of bug fixes from Friday.