Makefile corrections, added missing files