Issue resolver enhancements

Issue resolver enhancements - fix up command line arguments and tidy up some shizzle