Added DeathMatch, fixed a few bugs