Added randomizer & few tweaks