diff --git a/source/c_combat.qc b/source/c_combat.qc
index 61ff90a..cf2eaa2 100644
--- a/source/c_combat.qc
+++ b/source/c_combat.qc
@@ -147,10 +147,9 @@ void(entity targ, entity inflictor, entity attacker, float damage) ent_damage =
 
 	// add to the damage total for clients, which will be sent as a single
 	// message at the end of the frame
-	// FIXME: remove after combining shotgun blasts?
 	if(targ.flags & FL_CLIENT) {
-		targ.dmg_take = targ.dmg_take + take;
-		targ.dmg_save = targ.dmg_save + save;
+		targ.dmg_take += take;
+		targ.dmg_save += save;
 		targ.dmg_inflictor = inflictor;
 	}
 
diff --git a/source/m_ogre.qc b/source/m_ogre.qc
index 1b95022..06ff468 100644
--- a/source/m_ogre.qc
+++ b/source/m_ogre.qc
@@ -187,18 +187,13 @@ void() ogre_fire_grenade = {
 /*
 ================
 chainsaw
-
-FIXME
 ================
 */
 void(float side) chainsaw = {
 	vector delta;
 	float ldmg;
 
-	if(!self.enemy) {
-		return;
-	}
-	if(!ent_can_damage(self.enemy, self)) {
+	if(!self.enemy || !ent_can_damage(self.enemy, self)) {
 		return;
 	}
 
diff --git a/source/m_zombie.qc b/source/m_zombie.qc
index ca19f4e..bb37466 100644
--- a/source/m_zombie.qc
+++ b/source/m_zombie.qc
@@ -399,8 +399,6 @@ has been twice in two seconds, otherwise it goes into one of the four
 fast pain frames.
 
 A hit of less than 10 points of damage(winged by a shotgun) will be ignored.
-
-FIXME: don't use pain_finished because of nightmare hack
 =================
 */
 void(entity attacker, float take) zombie_pain = {
diff --git a/source/w_doors.qc b/source/w_doors.qc
index fe7300f..f59d83a 100644
--- a/source/w_doors.qc
+++ b/source/w_doors.qc
@@ -197,7 +197,6 @@ void() door_touch = {
 		return;
 	}
 
-	// FIXME: blink key on player's status bar
 	if((self.items & other.items) != self.items) {
 		switch(self.owner.items) {
 			case IT_KEY1: print_center(other, "You need the ", key_1_name()); break;
diff --git a/source/w_items.qc b/source/w_items.qc
index fcacaee..6b1803d 100644
--- a/source/w_items.qc
+++ b/source/w_items.qc
@@ -754,7 +754,7 @@ void() key_touch = {
 
 	sound(other, CHAN_ITEM, self.noise, 1, ATTN_NORM);
 	cmd_client(other, "bf\n");
-	other.items = other.items | self.items;
+	other.items |= self.items;
 
 	if(!coop) {
 		self.solid = SOLID_NOT;