make regex more regex-y

and a couple of minor misc changes