Miscellanea

This commit brings in all the changes to the files I’m not currently
focusing on. Rather than messing with things here and there, I’m going
to improve one discrete unit at a time, also keeping my commits as such.