Hopefully helps to clarify a few things.

Merge if you want to and if it doesn't confuse more.