Add possibility to compile with symbol DEBUG (use "make debug")
Minor fixes and improvements to debug-output