a few more tweaks, disabled the randomizer