diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerChunk.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerChunk.kt
index 52f04026..28dd7743 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerChunk.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerChunk.kt
@@ -774,7 +774,7 @@ class ServerChunk(world: ServerWorld, pos: ChunkPos) : Chunk<ServerWorld, Server
 
 						// some breathing room for other code, since placement checking is performance intense operation
 						if (!world.isInPreparation && world.clients.isNotEmpty())
-							delay(min(60L, anchor.reader.size.x * anchor.reader.size.y / 40L))
+							delay(min(60L, anchor.reader.size.x * anchor.reader.size.y / 240L))
 					}
 				}
 			}
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
index e6282747..c210857a 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
@@ -17,6 +17,7 @@ import ru.dbotthepony.kommons.util.IStruct2i
 import ru.dbotthepony.kstarbound.math.vector.Vector2d
 import ru.dbotthepony.kstarbound.math.vector.Vector2i
 import ru.dbotthepony.kstarbound.Globals
+import ru.dbotthepony.kstarbound.Registries
 import ru.dbotthepony.kstarbound.Starbound
 import ru.dbotthepony.kstarbound.defs.WarpAction
 import ru.dbotthepony.kstarbound.defs.WarpAlias
@@ -97,7 +98,7 @@ class ServerWorld private constructor(
 			clients.add(ServerWorldTracker(this, client, start))
 
 			//if (worldID is WorldID.Celestial)
-				//Registries.dungeons["terrainfeatures"]?.value?.generate(this@ServerWorld, random(), start.x.toInt(), start.y.toInt(), markSurfaceAndTerrain = false, forcePlacement = true)
+				//Registries.dungeons["naturalcave"]?.value?.generate(this@ServerWorld, random(), start.x.toInt(), start.y.toInt(), markSurfaceAndTerrain = false, forcePlacement = true)
 		} finally {
 			isBusy--
 		}
@@ -138,7 +139,7 @@ class ServerWorld private constructor(
 			}
 
 			clients.forEach {
-				it.remove()
+				it.remove("World shutting down", setReturnWarp = false)
 				it.client.enqueueWarp(WarpAlias.Return)
 			}
 		}
@@ -351,6 +352,10 @@ class ServerWorld private constructor(
 		} catch (err: Throwable) {
 			LOGGER.fatal("Exception in world tick loop", err)
 			eventLoop.shutdown()
+
+			if (worldID is WorldID.ShipWorld) {
+				server.channels.connectionByUUID(worldID.uuid)?.disconnect("Exception in shipworld tick loop: $err")
+			}
 		}
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
index 10fdc5a1..069aed7c 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
@@ -336,14 +336,14 @@ class ServerWorldTracker(val world: ServerWorld, val client: ServerConnection, p
 		}
 	}
 
-	fun remove(reason: String = "ServerWorldTracker got removed", nullifyVariables: Boolean = true) {
+	fun remove(reason: String = "ServerWorldTracker got removed", nullifyVariables: Boolean = true, setReturnWarp: Boolean = true) {
 		if (isRemoved.compareAndSet(false, true)) {
 			// erase all tasks just to be sure
 			tasks.clear()
 
 			val playerEntity = client.playerEntity
 
-			if (playerEntity != null && world.worldID is WorldID.Celestial) {
+			if (playerEntity != null && world.worldID is WorldID.Celestial && setReturnWarp) {
 				client.returnWarp = WarpAction.World(world.worldID, SpawnTarget.Position(playerEntity.position))
 			}