several fixes to prior commit