Updated Makefile
Bugfixes
Debugging