Some nicities

Just a few tweaks as I've been poking about