Fixed typo, added minor detail
Added more text about commenting out 'south' (please check!)
Formatting
Reverted an error I made.
Resolved conflict