Added some regex in the case where there are no underscores or spaces.  They are now handled, for the most part.

Eventually this should all be regex, I was just too lazy/annoyed to do it in the first place, I guess.