Fixed up some debug and issue when arguments are not provided