3 Changes, all in one clean PR

I realize that it might be harder to pick through and sort out any conflicts for the previous commits, so here's one that encompasses them all.

Thanks!