Review and changes from Jocelyn Fiat

see previous comment related to have a new nonce manager object.