Updated Makefile.validate to add entityID to .validate-file, updated update-and-valid...