Added proper 'debug' target to Makefile
Fixed more bugs in command parsing