Misc prettying up.