removed debug defines and fixed a bit with makefile