Makes some edits forwarded on from a reader

Wessel de Roode sent in some changes and here they are, thanks Wessel