Added dash support, word/num mixes, float testing