modified some errors