Refactoring
Fix output size, randomize order + small stuff
Misc improvements
Stuff