Added configs and improved Makefile