Numbers and words

Sorry, I think I pushed these to my previous PR after you already merged.