Here's where I am. I haven't finished all of your changes. Please look for
bold stuff, that's where I have questions. If no question is given, I'm
looking for your confirmation.