diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp
index 67037cc8..47287d41 100644
--- a/Adventures in Lestoria/Player.cpp	
+++ b/Adventures in Lestoria/Player.cpp	
@@ -1452,9 +1452,9 @@ const vf2d Player::GetAimingLocation(bool useWalkDir,bool invert){
 					}
 				}
 				if(closestPoint!=vf2d{std::numeric_limits<float>::max(),std::numeric_limits<float>::max()}){
-					//geom2d::line<float>aimingLine=geom2d::line<float>(GetPos(),closestPoint);
-					//vf2d aimingPoint=aimingLine.rpoint((invert?-1.f:1.f)*operator""_Pixels("Player.Aiming Cursor Max Distance"_F));
-					return game->GetScreenSize()/2+closestPoint-GetPos();
+					geom2d::line<float>aimingLine=geom2d::line<float>(GetPos(),closestPoint);
+					vf2d aimingPoint=aimingLine.rpoint(invert?(-operator""_Pixels("Player.Aiming Cursor Max Distance"_F)):std::min(aimingLine.length()+24.f,operator""_Pixels("Player.Aiming Cursor Max Distance"_F)));
+					return game->GetScreenSize()/2+aimingPoint-GetPos();
 				}else
 					return game->GetScreenSize()/2+vf2d{float(operator""_Pixels("Player.Aiming Cursor Max Distance"_F)),aimingAngle.y}.cart();
 			}
diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt
index 222cc346..c8c3e0d0 100644
--- a/Adventures in Lestoria/TODO.txt	
+++ b/Adventures in Lestoria/TODO.txt	
@@ -10,6 +10,9 @@ Upon the second time entering a stage, the game will spawn a timer that the play
 Upon completion of a stage in time trial mode if the player beat their previous time (which they likely will) the record will update.
 	For each class and stage combination there will be a "dev time"
 
+Settings menu doesn't scroll back up properly while the scrollbar does?
+Merchant descriptions have no newlines.
+
 ============================================
 Consider a "killed by player" / "marked by player" flag for monsters to determine if a player gets credit for a monster kill (for achievements)
 Make another actions config file for the main build (The app # is different)
\ No newline at end of file
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index 41c82e02..745b8d2d 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 0
 #define VERSION_PATCH 0
-#define VERSION_BUILD 8595
+#define VERSION_BUILD 8598
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/Adventures in Lestoria/assets/AdventuresInLestoria_DemoAvailable.png b/Adventures in Lestoria/assets/AdventuresInLestoria_DemoAvailable.png
new file mode 100644
index 00000000..511d6f49
Binary files /dev/null and b/Adventures in Lestoria/assets/AdventuresInLestoria_DemoAvailable.png differ
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index a1086d57..d631d9bb 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ