fix regex to get args properly
label skipifs as well