Christian

Tried to work in all the requested changes.