fixes to previous commit