add perfect shuffle, also more work on draft