Some tweaks, getting there.
Merge commit '7d8146a'