Pull djn's changes into my fork

These are just a bunch of small changes.