Adding more __debug__ switches
Adding argv