Little changes in regex and sth else