More fixes and new regular expression, status: stable