diff --git a/bin/generate-mini-attract-mode.sh b/bin/generate-mini-attract-mode.sh
index 42809ddec..4c05c22b8 100755
--- a/bin/generate-mini-attract-mode.sh
+++ b/bin/generate-mini-attract-mode.sh
@@ -10,7 +10,8 @@ cat res/games.conf |
     cut -d"=" -f1 | \
     while read game; do
         # if I knew how to use awk, this could be O(N) instead of O(N^2)
-        name=`cat res/games.conf | tr "\r" "\n" | grep "$game=" | cut -d"=" -f2`
+        name=`cat res/games.conf | tr "\r" "\n" | grep ",$game=" | cut -d"=" -f2`
+        echo "$game"" ""$name"
 
         # initialize attract mode configuration file for this game
         echo "#\n# Attract mode for $name\n#\n" > /tmp/g
@@ -26,7 +27,7 @@ cat res/games.conf |
         # add DHGR action screenshots, if any
         cat res/ss/ACTDHGR*.CONF |
             tr "\r" "\n" |
-            grep "$game""$" |
+            egrep "(^|=)""$game""$" |
             cut -d"=" -f1 |
             sed -e "s/^/ACTION.DHGR\//g" |
             sed -e "s/$/=B/g" |
@@ -36,7 +37,7 @@ cat res/games.conf |
         # add HGR action screenshots, if any
         cat res/ss/ACTION*.CONF |
             tr "\r" "\n" |
-            grep "$game""$" |
+            egrep "(^|=)""$game""$" |
             cut -d"=" -f1 |
             sed -e "s/^/ACTION.HGR\//g" |
             sed -e "s/$/=A/g" |
@@ -46,7 +47,7 @@ cat res/games.conf |
         # add GR action screenshots, if any
         cat res/ss/ACTGR*.CONF |
             tr "\r" "\n" |
-            grep "$game""$" |
+            egrep "(^|=)""$game""$" |
             cut -d"=" -f1 |
             sed -e "s/^/ACTION.GR\//g" |
             sed -e "s/$/=D/g" |
diff --git a/res/action.hgr/PUCK.MAN b/res/action.hgr/PUCK.MAN
new file mode 100644
index 000000000..28ae8bce4
Binary files /dev/null and b/res/action.hgr/PUCK.MAN differ
diff --git a/res/attract/HEAD.ON b/res/attract/HEAD.ON
index 14d01fee2..58a9fdd0a 100644
--- a/res/attract/HEAD.ON
+++ b/res/attract/HEAD.ON
@@ -1 +1 @@
-#
# Attract mode for Head On
Hyper Head On
#

ACTION.HGR/HEAD.ON=A
ACTION.HGR/HYPER.HEAD.ON2=A
ACTION.HGR/HYPER.HEAD.ON=A

[eof]
\ No newline at end of file
+#
# Attract mode for Head On
#

ACTION.HGR/HEAD.ON=A

[eof]
\ No newline at end of file
diff --git a/res/attract/MARIO.BROS b/res/attract/MARIO.BROS
index e16acce8d..b63a4b895 100644
--- a/res/attract/MARIO.BROS
+++ b/res/attract/MARIO.BROS
@@ -1 +1 @@
-#
# Attract mode for Mario Bros
#

ARTWORK.SHR/MARIO.BROS=C
ACTION.HGR/MARIO.BROS2=A
ACTION.HGR/MARIO.BROS3=A
ACTION.HGR/MARIO.BROS=A

[eof]
\ No newline at end of file
+#
# Attract mode for Mario Bros.
#

ARTWORK.SHR/MARIO.BROS=C
ACTION.HGR/MARIO.BROS2=A
ACTION.HGR/MARIO.BROS3=A
ACTION.HGR/MARIO.BROS=A

[eof]
\ No newline at end of file
diff --git a/res/attract/MR.DO b/res/attract/MR.DO
index ef77b287c..0feaa0979 100644
--- a/res/attract/MR.DO
+++ b/res/attract/MR.DO
@@ -1 +1 @@
-#
# Attract mode for Mr. Do
#

ACTION.HGR/MR.DO.L01=A
ACTION.HGR/MR.DO.L02=A
ACTION.HGR/MR.DO.L03=A
ACTION.HGR/MR.DO.L10=A

[eof]
\ No newline at end of file
+#
# Attract mode for Mr. Do!
#

ACTION.HGR/MR.DO.L01=A
ACTION.HGR/MR.DO.L02=A
ACTION.HGR/MR.DO.L03=A
ACTION.HGR/MR.DO.L10=A

[eof]
\ No newline at end of file
diff --git a/res/attract/OOTW b/res/attract/OOTW
index 4592fc166..b942308f3 100644
--- a/res/attract/OOTW
+++ b/res/attract/OOTW
@@ -1 +1 @@
-#
# Attract mode for Out Of This World
#

ACTION.GR/OOTW=D

[eof]
\ No newline at end of file
+#
# Attract mode for Out of This World
#

ACTION.GR/OOTW=D

[eof]
\ No newline at end of file
diff --git a/res/attract/PAC.MAN b/res/attract/PAC.MAN
index cbc75a2e9..fe26728fa 100644
--- a/res/attract/PAC.MAN
+++ b/res/attract/PAC.MAN
@@ -1 +1 @@
-#
# Attract mode for Pac-Man
#

ARTWORK.SHR/PAC.MAN=C
ACTION.HGR/PAC.MAN=A
PAC.MAN=0

[eof]
\ No newline at end of file
+#
# Attract mode for Pac-Man
#

ARTWORK.SHR/PAC.MAN=C
ACTION.HGR/PAC.MAN=A

[eof]
\ No newline at end of file
diff --git a/res/attract/PITSTOP.II b/res/attract/PITSTOP.II
index 81fcdb785..02468411c 100644
--- a/res/attract/PITSTOP.II
+++ b/res/attract/PITSTOP.II
@@ -1 +1 @@
-#
# Attract mode for Pit Stop II
#

ARTWORK.SHR/PITSTOP.II=C
ACTION.HGR/PITSTOP.II=A

[eof]
\ No newline at end of file
+#
# Attract mode for Pitstop II
#

ARTWORK.SHR/PITSTOP.II=C
ACTION.HGR/PITSTOP.II=A

[eof]
\ No newline at end of file
diff --git a/res/attract/PUCK.MAN b/res/attract/PUCK.MAN
index 38cb30ee6..aed4fd340 100644
--- a/res/attract/PUCK.MAN
+++ b/res/attract/PUCK.MAN
@@ -1 +1 @@
-#
# Attract mode for Puckman
#


[eof]
\ No newline at end of file
+#
# Attract mode for Puck Man
#

ACTION.HGR/PUCK.MAN=A

[eof]
\ No newline at end of file
diff --git a/res/ss/ACTIONPQR3.CONF b/res/ss/ACTIONPQR3.CONF
index 4aa5c0616..677456103 100644
--- a/res/ss/ACTIONPQR3.CONF
+++ b/res/ss/ACTIONPQR3.CONF
@@ -1 +1 @@
-#
# action shots slideshow of games that begin with "P","Q","R"
#

QUADRANT.6112
RESCUE.RAIDERS2=RESCUE.RAIDERS
PITFALL.II
PEST.PATROL2=PEST.PATROL
PHASER.FIRE
PICNIC.PARANOIA
RUSSKI.DUCK
RENEGADE
RIBBIT
ROADBLOCK

[eof]
\ No newline at end of file
+#
# action shots slideshow of games that begin with "P","Q","R"
#

QUADRANT.6112
RESCUE.RAIDERS2=RESCUE.RAIDERS
PITFALL.II
PEST.PATROL2=PEST.PATROL
PHASER.FIRE
PICNIC.PARANOIA
RUSSKI.DUCK
RENEGADE
RIBBIT
ROADBLOCK
PUCK.MAN

[eof]
\ No newline at end of file