Fix ( Added fixes ) : Makefile and Model fixes.