merge changes from bentley@ + more tweaks by me
Merge branch 'master' of github.com:jasperla/openbsd-wip