Some improvements to random_word