Various small things

Feel free to pick and choose what of these changes you want...