strings and  regexes added, files renamed, tabs -> spaces