renamer and randomizer cleaned up and added