modified some mistakes