Added --debug flags #531