fixed a bug and modified some formats