several fixes
several fixes
unicode fix