This makes it much closer to what the hardware probably does, and fixes
a few bugs along the way.