so many regex fixes