clean up (and finished) stuff reported in #62