fix build; delete TODO; build, run fine!
Merge branch 'master' of github.com:jasperla/openbsd-wip