minor improvements with the hope that slivers across machines get different hmacs