Made some changes on point 1..

There are a couple of mistakes left I think ... Will correct them later on!