Some debug stuff left in - primarily fixing the expedited option.