Changed compiler on Makefile, some work done into making context changes