iron out argument parser usage, add --debug option, and get this to work again in...