Corrections according to tutors comments.