diff --git a/lib/output/xml_marker_generator.rb b/lib/output/xml_marker_generator.rb
index 6cf217c25..a52de2b62 100644
--- a/lib/output/xml_marker_generator.rb
+++ b/lib/output/xml_marker_generator.rb
@@ -98,6 +98,13 @@ class XmlMarkerGenerator
           add_hint("The flag has been encoded using a standard encoding method, look for an unusual string of text and try to figure out how it was encoded, and decode it", "#{search_module.unique_id}stringencoder", "normal", xml)
         end
         add_hint("The flag is encoded using a #{search_module.attributes['name'].first}", "#{search_module.unique_id}name", "big_hint", xml)
+        if search_module.attributes['hint']
+          add_hint(search_module.attributes['hint'].first, "#{search_module.unique_id}hint", "big_hint", xml)
+        end
+      when "generator"
+        if search_module.attributes['hint']
+          add_hint(search_module.attributes['hint'].first, "#{search_module.unique_id}hint", "big_hint", xml)
+        end
     end
 
   end
diff --git a/modules/encoders/cipher/morse_code/secgen_metadata.xml b/modules/encoders/cipher/morse_code/secgen_metadata.xml
index a098ecf65..9db4929e4 100644
--- a/modules/encoders/cipher/morse_code/secgen_metadata.xml
+++ b/modules/encoders/cipher/morse_code/secgen_metadata.xml
@@ -16,9 +16,7 @@
 
   <reference>https://gist.github.com/mikedamage/105081</reference>
 
-  <hint>Morse code decoders are available online e.g. https://morsecode.scphillips.com/translator.html
-    Morse code has a single representation for parenthesis, the SecGen flag format uses curly braces. Replace them!
-  </hint>
+  <hint>Morse code decoders are available online e.g. https://morsecode.scphillips.com/translator.html</hint>
 
   <read_fact>strings_to_encode</read_fact>
 
diff --git a/modules/encoders/string/base64/secgen_metadata.xml b/modules/encoders/string/base64/secgen_metadata.xml
index 665448bc7..7c0b4401c 100644
--- a/modules/encoders/string/base64/secgen_metadata.xml
+++ b/modules/encoders/string/base64/secgen_metadata.xml
@@ -14,7 +14,7 @@
   <platform>linux</platform>
   <platform>windows</platform>
 
-  <hint>A simple transform using Base64. Decoding tools available online e.g. https://www.base64decode.org/</hint>
+  <hint>Decoding tools available online e.g. https://www.base64decode.org/</hint>
 
   <read_fact>strings_to_encode</read_fact>
   <read_fact>base64_options</read_fact>
diff --git a/scenarios/ctf/edge_hill_scenario.xml b/scenarios/ctf/edge_hill_scenario.xml
index 949ef73a8..f81803917 100644
--- a/scenarios/ctf/edge_hill_scenario.xml
+++ b/scenarios/ctf/edge_hill_scenario.xml
@@ -79,11 +79,7 @@
 						<value>Challenge 5</value>
 					</input>
 					<input into="paragraphs" unique_module_list="unique_encoders">
-						<generator type="ctf_challenge">
-							<input into="strings_to_encode">
-								<generator type="flag_generator" />
-							</input>
-						</generator>
+						<generator type="ctf_challenge" />
 					</input>
 				</generator>
 
@@ -92,11 +88,7 @@
 						<value>Challenge 6</value>
 					</input>
 					<input into="paragraphs" unique_module_list="unique_encoders">
-						<generator type="ctf_challenge">
-							<input into="strings_to_encode">
-								<generator type="flag_generator" />
-							</input>
-						</generator>
+						<generator type="ctf_challenge"/>
 					</input>
 				</generator>
 			</input>
@@ -104,23 +96,15 @@
 			<input into="hidden_tabs" unique_module_list="unique_encoders">
 				<generator type="flag_generator" />
 				<encoder type="ascii_reversible">
-					<input into="strings_to_encode" unique_module_list="unique_encoders">
+					<input into="strings_to_encode" >
 						<generator type="flag_generator" />
 					</input>
 				</encoder>
 			</input>
 
 			<input into="images_to_leak" unique_module_list="unique_encoders">
-				<generator type="image_challenge_generator">
-					<input into="strings_to_encode">
-						<generator type="flag_generator" />
-					</input>
-				</generator>
-				<generator type="image_challenge_generator" >
-					<input into="strings_to_encode">
-						<generator type="flag_generator" />
-					</input>
-				</generator>
+				<generator type="image_challenge_generator" />
+				<generator type="image_challenge_generator" />
 			</input>
 		</service>