diff --git a/match.go b/match.go
index 97efbd5..492ce27 100644
--- a/match.go
+++ b/match.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"math/rand"
 	"strconv"
 )
 
@@ -17,16 +18,16 @@ type match struct {
 func (m *match) loadGun() {
 	switch m.round {
 	case 1:
-		m.gun.magazine = m.gun.reload(4)
+		m.gun.magazine = m.gun.reload(rand.Intn(4) + 2)
 		break
 	case 2:
-		m.gun.magazine = m.gun.reload(8)
+		m.gun.magazine = m.gun.reload(rand.Intn(6) + 4)
 		break
 	case 3:
-		m.gun.magazine = m.gun.reload(16)
+		m.gun.magazine = m.gun.reload(rand.Intn(10) + 6)
 		break
 	default:
-		m.gun.magazine = m.gun.reload(1)
+		m.gun.magazine = m.gun.reload(rand.Intn(16) + 1)
 		break
 	}
 }
@@ -39,14 +40,14 @@ func (m *match) resetHP() {
 	HP := 1
 	switch m.round {
 	case 1:
-		HP = 5
-		break
-	case 2:
 		HP = 2
 		break
-	case 3:
+	case 2:
 		HP = 4
 		break
+	case 3:
+		HP = 5
+		break
 	}
 	m.host.HP = HP
 	m.guest.HP = HP
@@ -140,10 +141,12 @@ func (m *match) checkStatus() {
 	if m.host.HP < 1 {
 		m.sendMessage("I died", m.host)
 		m.sendMessage("I won", m.guest)
+		m.nextRound()
 	}
 	if m.guest.HP < 1 {
 		m.sendMessage("I died", m.guest)
 		m.sendMessage("I won", m.host)
+		m.nextRound()
 	}
 	if m.host.HP > 0 && m.guest.HP > 0 {
 		if m.round >= 3 {
@@ -154,6 +157,8 @@ func (m *match) checkStatus() {
 		}
 	}
 	if len(m.gun.magazine) == 0 {
-		m.nextRound()
+		m.loadGun()
+		m.giveItems()
+		m.announceItems()
 	}
 }