Made some additions. Nothing big.
Merge conflict fixed