some regex fixes (that don't really work?)