Walking through the code. Minor changes.
Merging conflicts