fix errors by me in 1st commit x2