several fixes
several fixes