tweaking use of regexes, various updates, bringing project back to life essentially