Add many tasks to be done for the journal version.
PEP8-ify(). Boy, that was tiring and boring. Hopefully I didn't introduce any bug ;)
Whitespace