Llr wf9

These changes address the easy subset of Kabirs review comments. I will send you an email on which comments still need resolving