clean a bit.
more $UNIX2003 fun. fixes #6