diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt
index ac9eab692e..0096461207 100644
--- a/core/src/com/unciv/logic/city/CityConstructions.kt
+++ b/core/src/com/unciv/logic/city/CityConstructions.kt
@@ -11,6 +11,7 @@ import com.unciv.models.ruleset.unit.BaseUnit
 import com.unciv.models.stats.Stats
 import com.unciv.models.translations.tr
 import com.unciv.ui.cityscreen.ConstructionInfoTable
+import com.unciv.ui.utils.Fonts
 import com.unciv.ui.utils.withItem
 import com.unciv.ui.utils.withoutItem
 import java.util.*
@@ -116,13 +117,13 @@ class CityConstructions {
 
     fun getProductionForTileInfo(): String {
         /* this is because there were rare errors tht I assume were caused because
-           currentContruction changed on another thread */
+           currentConstruction changed on another thread */
         val currentConstructionSnapshot = currentConstructionFromQueue
         var result = currentConstructionSnapshot.tr()
         if (currentConstructionSnapshot!=""
                 && !PerpetualConstruction.perpetualConstructionsMap.containsKey(currentConstructionSnapshot)) {
             val turnsLeft = turnsToConstruction(currentConstructionSnapshot)
-            result += ConstructionInfoTable.turnOrTurns(turnsLeft)
+            result += " - $turnsLeft ${Fonts.turn}"
         }
         return result
     }
@@ -376,8 +377,9 @@ class CityConstructions {
     fun chooseNextConstruction() {
         validateConstructionQueue()
         if (constructionQueue.isNotEmpty()) {
-            currentConstructionIsUserSet = true
-            if (currentConstructionFromQueue != "" && getConstruction(currentConstructionFromQueue) !is PerpetualConstruction) return
+            if (currentConstructionFromQueue != ""
+                    // If the USER set a perpetual construction, then keep it!
+                    && (getConstruction(currentConstructionFromQueue) !is PerpetualConstruction || currentConstructionIsUserSet)) return
         }
 
         ConstructionAutomation(this).chooseNextConstruction()
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 665c1ce6e0..e151e9f579 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -373,7 +373,7 @@ open class TileInfo {
         if (roadStatus !== RoadStatus.None && !isCityCenter()) lineList += roadStatus.toString().tr()
         if (improvement != null) lineList += improvement!!.tr()
         if (improvementInProgress != null && isViewableToPlayer)
-            lineList += "{$improvementInProgress}\r\n  $turnsToImprovement ${Fonts.turn}".tr() // todo change to [] translation notation
+            lineList += "{$improvementInProgress}  $turnsToImprovement ${Fonts.turn}".tr()
         if (civilianUnit != null && isViewableToPlayer)
             lineList += civilianUnit!!.name.tr() + " - " + civilianUnit!!.civInfo.civName.tr()
         if (militaryUnit != null && isViewableToPlayer) {
diff --git a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
index 0dfad2c078..f2f7ecd2bf 100644
--- a/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
@@ -55,7 +55,7 @@ class ImprovementPickerScreen(val tileInfo: TileInfo, val onAccept: ()->Unit) :
 
             var labelText = improvement.name.tr()
             val turnsToBuild = improvement.getTurnsToBuild(currentPlayerCiv)
-            if (turnsToBuild > 0) labelText += " - $turnsToBuild {turns}"
+            if (turnsToBuild > 0) labelText += " - $turnsToBuild ${Fonts.turn}"
             val provideResource = tileInfo.hasViewableResource(currentPlayerCiv) && tileInfo.getTileResource().improvement == improvement.name
             if (provideResource) labelText += "\n" + "Provides [${tileInfo.resource}]".tr()
             val removeImprovement = (improvement.name != RoadStatus.Road.name