#24 minor fixes