* Added two suggestions for regex improvement, one fully worked out

* Small regex fix
* Fixed typo