Some fixes + Added permutation to distribute load equally