Some more work on shuffle proof generator
Merge origin/master