add some openbsd tags, and a first pass at cleanup;