Bugfixes esp. regex delimiters