My review commits

Here are my commits. I lost them once, because I did a "git reset --hard" while making some other change, without thinking. :( I've done most of the changes back from memory and I've tried them on and checked the config.xml.

Please take a quick look, before you accept it.