disable debug (error)

Conflicts:
	Makefile
Add lost files