fixed errors. Pr1 done