Some Cleanup, Deathmap with EColorpalette and namePrefix