#26 minor fixes