Updated settings and Makefile to be more user agnostic.