Normalize with diveintomark

Tons of updates from the diveintomark branch
We are almost the same