removing some things, adding some back. tweaking some of the regexes.