Please see the final commit message

The issues are all in there...