Added a "What has been changed" section to the OP, I'll deal with the rest later.