Various minor improvements from a complete beginner

Each change is in its own commit so let me know if you want me to drop any. Cheers.