add more if tag tests, more arg parsing