Tweaks to add json serialization/deserialization error handling, reordering to make Ordered shuffle the "default"