Various minor tweaks

Probably forgot to change the version numbers. Oh well.