some minor fixes (including #4)