as the title said, make the deathmatch endless but have time limit or add a option for kill limit so the deathmatch will be longer but keep the time limit, and also fix the spawn point because everytime you spawn, someone is already behind you or besides you, sometimes in front of you, just saying.

Edit: this is my suggestion so.