updates nonce with lots of little things
Merge branch 'master' of github.com:embr/nonce