More clarifying of what is where,  will commit in a few days and _not_ 
to the branch.

Andrew