Fixed the rest of the formatting inconsistencies and made the logging a
bit more verbose.