Unroll Makefile bug + several additions