some format errors modified