Cleaned up regexp, added as finalizing chars as well.