Pretty log.
Merge conflicts. Final cleanup and comments.