pull target and source dirs out of options and into the first couple of arguments. few stability improvements