tighten up regexes and get the persistence for aliases working