Updated

I saw and address most of your comments. I've left two in there that we'll have to discuss.