Corrected some mistakes and added some extra text
Merge conflicts solved