cleanup, fixes
updates, fixes, locks, nonces, etc.