added '-' handling as well, should be most of the characters now