oops, one more bug fixed around . and keywords, allowing whitespace