more typefixing