added config thingy, updated Makefile