Added checks
Changed default debug level