fixes to prior commit