fix charset
small bugfixes
rm old type changes
cleanup