fixing some macro and cp152/utf8 stuff