Minor stuff

Tweaks to a bunch of little things.