Updated makefile and setup for new settings method