Working on getting fenris to compile clean
Cleanup, still on Makefile