more progress on crypto/rand parity