#77 minor fixes