Made several changes that Julia requested taking into account Ian Fisk's change.
However, there are still some questions denoted in red.