Now handles large whitespaces correctly. Now handles numbers