Another round of updates based on feedback from @jamielinux.