seems to be done
fixed encoding