Two patches. Wait, three.

Today's problems:

Cos man, it's been a busy couple of weeks. And that's not even the real stuff; that's just the yakshaving.