8 files changed, 15 insertions, 7 deletions
diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index 6b2e5ba828..6617096c8b 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -235,14 +235,16 @@ A:bug
 
 Please submit a bug report on Sourceforge, and give as much information as
 you can. (What were you doing at the time? What did you expect to happen,
-what happened instead? etc.) Sometimes a screenshot can be helpful. For
-crashes or monsters/items/levels behaving oddly, we probably need a save
-file. To be on the safe side, attach the entire zipped save of the character
-in question. If there are error messages, please write them down. Short of a
-save file, a guide on how to reproduce the crash (or bug) can be useful; you
-can use wizard mode for this.
+what happened instead? etc.) Most importantly, what version are you playing? 
+Sometimes a screenshot can be helpful. For crashes or monsters/items/levels 
+behaving oddly, we probably need a save file. To be on the safe side, attach 
+the entire zipped save of the character in question. If there are error 
+messages, please write them down. Short of a save file, a guide on how to 
+reproduce the crash (or bug) can be useful; you can use wizard mode for this.
+
 If you don't log in to Sourceforge or leave an email address at least check
 the thread from time to time in case we have some more questions. 
+
 Thanks in advance!
 %%%%
 Q:ideas
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 2fe87f9c9d..bf1e4fc9bb 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -369,7 +369,7 @@ ENDMAP
 NAME:   labyrinth_single_monster
 TAGS:   lab allow_dup generate_awake
 KFEAT:  x = .
-KMONS:  x = trapdoor spider / w:3 wandering mushroom
+KMONS:  x = trapdoor spider / w:2 wandering mushroom
 MAP
 x
 ENDMAP
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index a9249020ce..16767dabc2 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -81,6 +81,7 @@ big_fish MONS_BIG_FISH /*';'*/
 giant_goldfish MONS_GIANT_GOLDFISH /*';'*/
 electrical_eel MONS_ELECTRICAL_EEL /*';'*/
 lava_fish MONS_LAVA_FISH /*';'*/
+shark MONS_SHARK /*';'*/
 jellyfish MONS_JELLYFISH /*'J'*/
 
 ## Beetles
@@ -314,6 +315,7 @@ hippogriff MONS_HIPPOGRIFF /*'H'*/
 manticore MONS_MANTICORE /*'H'*/
 griffon MONS_GRIFFON /*'H'*/
 sphinx MONS_SPHINX /*'H'*/
+harpy MONS_HARPY /*'H'*/
 
 ## Ice beast only
 ice_beast MONS_ICE_BEAST /*'I'*/
diff --git a/crawl-ref/source/rltiles/dc-mon/animals/shark.png b/crawl-ref/source/rltiles/dc-mon/animals/shark.png
new file mode 100644
index 0000000000..dfc148b569
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/animals/shark.png
diff --git a/crawl-ref/source/rltiles/dc-mon/harpy.png b/crawl-ref/source/rltiles/dc-mon/harpy.png
new file mode 100644
index 0000000000..850b862edd
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/harpy.png
diff --git a/crawl-ref/source/rltiles/dc-mon/siren.png b/crawl-ref/source/rltiles/dc-mon/siren.png
index 8b2f6a5e30..d5d64307ef 100644
--- a/crawl-ref/source/rltiles/dc-mon/siren.png
+++ b/crawl-ref/source/rltiles/dc-mon/siren.png
diff --git a/crawl-ref/source/rltiles/dc-mon/siren_water.png b/crawl-ref/source/rltiles/dc-mon/siren_water.png
index f859c643ab..e052e13163 100644
--- a/crawl-ref/source/rltiles/dc-mon/siren_water.png
+++ b/crawl-ref/source/rltiles/dc-mon/siren_water.png
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 365fe64c8b..4078b8b118 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -519,6 +519,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_GRIFFON;
     case MONS_SPHINX:
         return TILEP_MONS_SPHINX;
+    case MONS_HARPY:
+        return TILEP_MONS_HARPY;
 
     // ice beast ('I')
     case MONS_ICE_BEAST:
@@ -695,6 +697,8 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_GIANT_GOLDFISH;
     case MONS_ELECTRICAL_EEL:
         return TILEP_MONS_ELECTRICAL_EEL;
+    case MONS_SHARK:
+        return TILEP_MONS_SHARK;
     case MONS_JELLYFISH:
         return TILEP_MONS_JELLYFISH;