Continued tinkering with regex