diff --git a/res/attract-mode.txt b/res/attract-mode.txt
index 3695cc6d9..feb41abeb 100644
--- a/res/attract-mode.txt
+++ b/res/attract-mode.txt
@@ -76,11 +76,11 @@ Vindicator
 Agent USA
 Alien Ambush
 Alien Downpour
-Alien Rain
-Aquatron
 Hard Hat Mack
 
 # done
+Alien Rain
+Aquatron
 Bolo
 BurgerTime
 Championship Lode Runner
diff --git a/res/attract.conf b/res/attract.conf
index 0124c5607..2c19cdc1d 100644
--- a/res/attract.conf
+++ b/res/attract.conf
@@ -1 +1 @@
-#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
#HARD.HAT.MACK=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
+#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

SAMMY.LIGHTFOOT=3
#AGENT.USA=3
#ALIEN.DOWNPOUR=3
#ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
#HARD.HAT.MACK=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
diff --git a/res/demo/AGENT.USA b/res/demo/AGENT.USA
new file mode 100755
index 000000000..494a3f173
Binary files /dev/null and b/res/demo/AGENT.USA differ
diff --git a/res/demo/AGENT.USA.1 b/res/demo/AGENT.USA.1
new file mode 100755
index 000000000..017cc6df1
Binary files /dev/null and b/res/demo/AGENT.USA.1 differ
diff --git a/res/demo/ALIEN.AMBUSH b/res/demo/ALIEN.AMBUSH
new file mode 100755
index 000000000..4e4818d65
Binary files /dev/null and b/res/demo/ALIEN.AMBUSH differ
diff --git a/res/demo/ALIEN.DOWNPOUR b/res/demo/ALIEN.DOWNPOUR
new file mode 100755
index 000000000..296ba9de8
Binary files /dev/null and b/res/demo/ALIEN.DOWNPOUR differ
diff --git a/res/demo/ALIEN.DWNPOUR.1 b/res/demo/ALIEN.DWNPOUR.1
new file mode 100755
index 000000000..74b9607a5
Binary files /dev/null and b/res/demo/ALIEN.DWNPOUR.1 differ
diff --git a/res/demo/SAMMY.1 b/res/demo/SAMMY.1
new file mode 100755
index 000000000..62a856f2b
Binary files /dev/null and b/res/demo/SAMMY.1 differ
diff --git a/res/demo/SAMMY.2 b/res/demo/SAMMY.2
new file mode 100755
index 000000000..1281b6463
Binary files /dev/null and b/res/demo/SAMMY.2 differ
diff --git a/res/demo/SAMMY.3 b/res/demo/SAMMY.3
new file mode 100755
index 000000000..d1c3fdcb7
Binary files /dev/null and b/res/demo/SAMMY.3 differ
diff --git a/res/demo/SAMMY.4 b/res/demo/SAMMY.4
new file mode 100755
index 000000000..95c5930a5
Binary files /dev/null and b/res/demo/SAMMY.4 differ
diff --git a/res/demo/SAMMY.5 b/res/demo/SAMMY.5
new file mode 100755
index 000000000..7345d3faf
Binary files /dev/null and b/res/demo/SAMMY.5 differ
diff --git a/res/demo/SAMMY.LIGHTFOOT b/res/demo/SAMMY.LIGHTFOOT
new file mode 100755
index 000000000..48e7bdee5
Binary files /dev/null and b/res/demo/SAMMY.LIGHTFOOT differ
diff --git a/res/demo/SAMMY.Z b/res/demo/SAMMY.Z
new file mode 100755
index 000000000..364e5f2fd
Binary files /dev/null and b/res/demo/SAMMY.Z differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index eafdf3290..8fa003314 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -1,7 +1,12 @@
-ALIEN.RAIN.1=Type(F1),AuxType(0000),Access(C3)
+AGENT.USA=Type(06),AuxType(367C),Access(C3)
+AGENT.USA.1=Type(F1),AuxType(0000),Access(C3)
+ALIEN.AMBUSH=Type(06),AuxType(4000),Access(C3)
+ALIEN.DOWNPOUR=Type(06),AuxType(0300),Access(C3)
+ALIEN.DWNPOUR.1=Type(F1),AuxType(0000),Access(C3)
 ALIEN.RAIN=Type(06),AuxType(0300),Access(C3)
-AQUATRON.1=Type(F1),AuxType(0000),Access(C3)
+ALIEN.RAIN.1=Type(F1),AuxType(0000),Access(C3)
 AQUATRON=Type(06),AuxType(0300),Access(C3)
+AQUATRON.1=Type(F1),AuxType(0000),Access(C3)
 BOLO=Type(06),AuxType(10E5),Access(C3)
 BURGERTIME=Type(06),AuxType(3E97),Access(C3)
 BURGERTIME.1=Type(F1),AuxType(A402),Access(C3)
@@ -12,24 +17,31 @@ BURGERTIME.5=Type(F1),AuxType(6000),Access(C3)
 CHAMP.LODERUN=Type(06),AuxType(0800),Access(C3)
 CHAMP.LODERUN.1=Type(F1),AuxType(0000),Access(C3)
 CHAMP.LODERUN.Z=Type(F1),AuxType(0000),Access(C3)
-DINO.EGGS.1=Type(F1),AuxType(0000),Access(C3)
 DINO.EGGS=Type(06),AuxType(0300),Access(C3)
-JUNGLE.HUNT.1=Type(F1),AuxType(0000),Access(C3)
+DINO.EGGS.1=Type(F1),AuxType(0000),Access(C3)
 JUNGLE.HUNT=Type(06),AuxType(0300),Access(C3)
-JUNGLE.HUNT.J=Type(F1),AuxType(0000),Access(C3)
-JUNGLE.HUNT.H=Type(F1),AuxType(7700),Access(C3)
-JUNGLE.HUNT.F=Type(F1),AuxType(7700),Access(C3)
-JUNGLE.HUNT.C=Type(F1),AuxType(7700),Access(C3)
+JUNGLE.HUNT.1=Type(F1),AuxType(0000),Access(C3)
 JUNGLE.HUNT.A=Type(F1),AuxType(7700),Access(C3)
+JUNGLE.HUNT.C=Type(F1),AuxType(7700),Access(C3)
+JUNGLE.HUNT.F=Type(F1),AuxType(7700),Access(C3)
+JUNGLE.HUNT.H=Type(F1),AuxType(7700),Access(C3)
+JUNGLE.HUNT.J=Type(F1),AuxType(0000),Access(C3)
 LODE.RUNNER=Type(06),AuxType(1F00),Access(C3)
 LODE.RUNNER.1=Type(F1),AuxType(0000),Access(C3)
 LODE.RUNNER.M=Type(F1),AuxType(0000),Access(C3)
 PEST.PATROL=Type(06),AuxType(0800),Access(C3)
 PITFALL.II=Type(06),AuxType(08E5),Access(C3)
-PLASMANIA.1=Type(F1),AuxType(0000),Access(C3)
 PLASMANIA=Type(06),AuxType(0300),Access(C3)
-POOYAN.1=Type(F1),AuxType(0000),Access(C3)
+PLASMANIA.1=Type(F1),AuxType(0000),Access(C3)
 POOYAN=Type(06),AuxType(0300),Access(C3)
+POOYAN.1=Type(F1),AuxType(0000),Access(C3)
+SAMMY.LIGHTFOOT=Type(06),AuxType(0300),Access(C3)
+SAMMY.1=Type(F1),AuxType(0000),Access(C3)
+SAMMY.2=Type(F1),AuxType(0000),Access(C3)
+SAMMY.3=Type(F1),AuxType(0000),Access(C3)
+SAMMY.4=Type(F1),AuxType(0000),Access(C3)
+SAMMY.5=Type(F1),AuxType(0000),Access(C3)
+SAMMY.Z=Type(F1),AuxType(0000),Access(C3)
 SNEAKERS=Type(06),AuxType(0800),Access(C3)
 SNEAKERS.1=Type(F1),AuxType(0000),Access(C3)
 SPARE.CHANGE=Type(06),AuxType(2700),Access(C3)
diff --git a/res/notes/alien-ambush.txt b/res/notes/alien-ambush.txt
new file mode 100644
index 000000000..bc22f5422
--- /dev/null
+++ b/res/notes/alien-ambush.txt
@@ -0,0 +1,2 @@
+$60CA: C99BF0 -> 4C0001 to exit when user presses a key (context is C99BF007C9D3F003)
+$60DB: AD10C0 -> 4C0001 to exit when user presses a button (context is AD10C04CAC60AD10C0)
diff --git a/res/notes/sammy-lightfoot.txt b/res/notes/sammy-lightfoot.txt
new file mode 100644
index 000000000..93b466357
--- /dev/null
+++ b/res/notes/sammy-lightfoot.txt
@@ -0,0 +1,9 @@
+$022B: AD00C0 -> A901EA to disable initial key detection (context is 8D8F6EAD00C0C99B)
+$68C5: AD00C0 -> AD10C0 (context is A9028DD794AD00C0)
+$B050: AD51C0 -> 4C0001 to exit at end of demo cycle (context is AD54C0AD51C0ADFC95F021)
+$7DB9: C992F0 -> 4C0001 to exit on keypress (context is AD00C01018C992F028)
+$B15A: A9008D -> 4C0001 to exit on keypress (context is AD00C0300160A9008D6B73)
+$6EE9: C0 -> D0 to disable sound during demo (context is AD30C088D004C601)
+$5035: A9018D -> 4C0001 to exit on keypress during Sierra title (context is AD00C01008A9018D03504CDB50)
+$7864: 6868A9 -> 4C0001 to exit on keypress during sparkles (context is AD00C010076868A9018D035060)
+$4FBE: 01 -> 04 to reduce number of sparkles (context is AD31031869018D3103C900D0D760)