Fix for type signature not in context
Updates makefile
Forces {} on declarations