Added some more delimiters, fixed a dumb bug in valid() :)