Random stuff.

Just collecting a few commits into one.