some more fixes - wierd chars left to be fixed