added #defines, updated makefile