#13 minor fixes