Updated makefile and changed some defaults