minor fixes to previous commit