update unless statements, targeturi, and resolve var
test