adding tracking, fixing regexes a little bit