OK
several fixes