Tidying.
Minor edits.
Changed a filename.
Adding notes to self.
Thinking.
Fixed merge conflict.