Bugfixing & regex fixing