move some things around so i have less trouble reading this, fix a spelling mistake and add some knf.
move some things around so i have less trouble reading this, fix a spelling
mistake and add some knf.

ok marco@

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars