I took most of your changes and merged in some language from earlier. Take one last look, but I think we're good to go.