diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4f2b743..f337b75 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,11 +1,17 @@
 plugins {
   `kotlin-dsl`
+  kotlin("jvm") version "1.5.31"
 }
 
 dependencies {
 
   val kotlinVersion = "1.5.31"
 
+//  implementation(gradleApi())
+
+//  implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:${org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion}")
+//  implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:${kotlinVersion}")
+
   implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion"))
 
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
diff --git a/modules/mod2/dukat-custom/5.2-only.module_lua-types.kt b/modules/mod2/dukat-custom/5.2-only.module_lua-types.kt
index 85d3c1e..d47462e 100644
--- a/modules/mod2/dukat-custom/5.2-only.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/5.2-only.module_lua-types.kt
@@ -14,4 +14,4 @@ import org.w3c.performance.*
 import org.w3c.workers.*
 import org.w3c.xhr.*
 
-external fun collectgarbage(opt: String /* "count" | "generational" | "incremental" */): dynamic /* Unit */
\ No newline at end of file
+//external fun collectgarbage(opt: String /* "count" | "generational" | "incremental" */): dynamic /* Unit */
\ No newline at end of file
diff --git a/modules/mod2/dukat-custom/5.2-plus.module_lua-types.kt b/modules/mod2/dukat-custom/5.2-plus.module_lua-types.kt
index b7e567f..adcf485 100644
--- a/modules/mod2/dukat-custom/5.2-plus.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/5.2-plus.module_lua-types.kt
@@ -15,8 +15,8 @@ import org.w3c.workers.*
 import org.w3c.xhr.*
 import tsstdlib.Record
 
-external var _ENV: Record<String, Any>
+//external var _ENV: Record<String, Any>
 
-external fun collectgarbage(opt: String /* "isrunning" */): Boolean
+//external fun collectgarbage(opt: String /* "isrunning" */): Boolean
 
-external fun module(name: String, vararg options: Function<*>)
\ No newline at end of file
+//external fun module(name: String, vararg options: Function<*>)
\ No newline at end of file
diff --git a/modules/mod2/dukat-custom/5.2-only.bit32.module_lua-types.kt b/modules/mod2/dukat-custom/bit32/5.2-only.bit32.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/5.2-only.bit32.module_lua-types.kt
rename to modules/mod2/dukat-custom/bit32/5.2-only.bit32.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/builtin-types.module_typed-factorio.kt b/modules/mod2/dukat-custom/builtin-types.module_typed-factorio.kt
index f03d9c3..ecd4eab 100644
--- a/modules/mod2/dukat-custom/builtin-types.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/builtin-types.module_typed-factorio.kt
@@ -1,6 +1,7 @@
 @file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS")
 
 import kotlin.js.*
+import kotlinext.js.PropertyDescriptor
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import org.w3c.dom.events.*
@@ -30,4 +31,33 @@ typealias uint16 = Number
 
 typealias uint64 = Number
 
-typealias table = Any?
\ No newline at end of file
+//typealias table = Any?
+// TODO LuaTable? AnyTable? index.module_typescript-to-lua.kt
+@JsName("table")
+class table  : Object2()
+
+/** https://github.com/JetBrains/kotlin-wrappers/blob/master/kotlin-extensions/src/main/kotlin/kotlinext/js/Object.kt */
+open external class Object2   {
+  fun toLocaleString(): String
+  fun valueOf(): dynamic
+  fun hasOwnProperty(v: String): Boolean
+  fun isPrototypeOf(v: Any): Boolean
+  fun propertyIsEnumerable(v: String): Boolean
+
+  companion object {
+    fun <P : Any, T : P> getPrototypeOf(o: T): P
+    fun <T> getOwnPropertyDescriptor(o: Any, p: String): PropertyDescriptor<T>
+    fun getOwnPropertyNames(o: Any): Array<String>
+    fun <T : Any> create(o: T?, properties: dynamic = definedExternally): T
+    fun <T : Any, P> defineProperty(o: T, p: String, attributes: PropertyDescriptor<P>): T
+    fun <T : Any> defineProperties(o: T, properties: dynamic): T
+    fun <T> seal(o: T): T
+    fun <R, T : R> freeze(o: T): R
+    fun <T> preventExtensions(o: T): T
+    fun isSealed(o: Any): Boolean
+    fun isFrozen(o: Any): Boolean
+    fun isExtensible(o: Any): Boolean
+    fun keys(o: Any): Array<String>
+    fun <T : Any, R : T> assign(dest: R, vararg src: T?): R
+  }
+}
diff --git a/modules/mod2/dukat-custom/classes.module_typed-factorio.kt b/modules/mod2/dukat-custom/classes.module_typed-factorio.kt
index 1f051a8..7b92c6a 100644
--- a/modules/mod2/dukat-custom/classes.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/classes.module_typed-factorio.kt
@@ -52,18 +52,18 @@ import defines.control_behavior.transport_belt.content_read_mode
 import defines.group_state
 
 external interface LuaAISettings {
-    var allow_destroy_when_commands_fail: Boolean
-    var allow_try_return_to_spawner: Boolean
-    var do_separation: Boolean
+    var allow_destroy_when_commands_fail: Boolean?
+    var allow_try_return_to_spawner: Boolean?
+    var do_separation: Boolean?
     var path_resolution_modifier: int8
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaAISettings" */
     fun help(): String
 }
 
 external interface LuaAccumulatorControlBehavior : LuaControlBehavior {
     var output_signal: SignalID
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaAccumulatorControlBehavior" */
     fun help(): String
 }
@@ -77,9 +77,9 @@ external interface LuaAchievementPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var allowed_without_fight: Boolean
-    var hidden: Boolean
-    var valid: Boolean
+    var allowed_without_fight: Boolean?
+    var hidden: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaAchievementPrototype" */
     fun help(): String
 }
@@ -94,14 +94,14 @@ external interface LuaAmmoCategoryPrototype {
         get() = definedExternally
         set(value) = definedExternally
     var bonus_gui_order: String
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaAmmoCategoryPrototype" */
     fun help(): String
 }
 
 external interface LuaArithmeticCombinatorControlBehavior : LuaCombinatorControlBehavior {
     var parameters: ArithmeticCombinatorParameters
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaArithmeticCombinatorControlBehavior" */
     fun help(): String
 }
@@ -115,10 +115,10 @@ external interface LuaAutoplaceControlPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var richness: Boolean
+    var richness: Boolean?
     var control_order: String
     var category: String
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaAutoplaceControlPrototype" */
     fun help(): String
 }
@@ -137,7 +137,7 @@ external interface `T$1` {
 external interface `T$2` {
     var player_index: uint
     var entity: LuaEntity
-    var from_player: Boolean
+    var from_player: Boolean?
 }
 
 external interface `T$3` {
@@ -223,7 +223,7 @@ external interface LuaBurner {
     var remaining_burning_fuel: double
     var currently_burning: LuaItemPrototype
     var fuel_categories: Record<String, Boolean>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaBurner" */
     fun help(): String
 }
@@ -243,23 +243,29 @@ external interface `T$8` {
 
 external interface LuaBurnerPrototype {
     var emissions: double
-    var render_no_network_icon: Boolean
-    var render_no_power_icon: Boolean
+    var render_no_network_icon: Boolean?
+    var render_no_power_icon: Boolean?
     var effectivity: double
     var fuel_inventory_size: uint
     var burnt_inventory_size: uint
     var smoke: Array<SmokeSource>
     var light_flicker: `T$8`
     var fuel_categories: Record<String, Boolean>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaBurnerPrototype" */
     fun help(): String
 }
 
-external interface LuaChunkIterator : LuaIterable<ChunkPositionAndArea> {
+external interface  LuaIterable<TValue, TState: Any?> :
+    tsstdlib.Iterable<TValue>,
+    LuaIterator<TValue, TState>
+//    ,
+//    LuaExtension<String>
+
+external interface LuaChunkIterator : LuaIterable<ChunkPositionAndArea, Any?> {
     @nativeInvoke
     operator fun invoke(): ChunkPositionAndArea?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaChunkIterator" */
     fun help(): String
 }
@@ -272,7 +278,7 @@ external interface LuaCircuitNetwork {
     var signals: Array<Signal>?
     var network_id: uint
     var connected_circuit_count: uint
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaCircuitNetwork" */
     fun help(): String
 }
@@ -286,7 +292,7 @@ external interface LuaCommandProcessor {
     fun add_command(name: String, help: Any /* JsTuple<String, Any> */, _function: (param1: CustomCommandData) -> Unit)
     fun add_command(name: String, help: String, _function: (param1: CustomCommandData) -> Unit)
     fun add_command(name: String, help: Number, _function: (param1: CustomCommandData) -> Unit)
-    fun remove_command(name: String): Boolean
+    fun remove_command(name: String): Boolean?
     var commands: Record<String, dynamic /* JsTuple<String, Any> | String | Number */>
     var game_commands: Record<String, dynamic /* JsTuple<String, Any> | String | Number */>
     var object_name: String /* "LuaCommandProcessor" */
@@ -296,15 +302,15 @@ external interface LuaConstantCombinatorControlBehavior : LuaControlBehavior {
     fun set_signal(index: uint, signal: Signal)
     fun get_signal(index: uint): Signal
     var parameters: Array<ConstantCombinatorParameters>
-    var enabled: Boolean
+    var enabled: Boolean?
     var signals_count: uint
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaConstantCombinatorControlBehavior" */
     fun help(): String
 }
 
 external interface LuaContainerControlBehavior : LuaControlBehavior {
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaContainerControlBehavior" */
     fun help(): String
 }
@@ -355,12 +361,12 @@ external interface `T$10` {
 }
 
 external interface `T$11` {
-    var walking: Boolean
+    var walking: Boolean?
     var direction: direction
 }
 
 external interface `T$12` {
-    var mining: Boolean
+    var mining: Boolean?
     var position: Position?
         get() = definedExternally
         set(value) = definedExternally
@@ -372,16 +378,16 @@ external interface `T$13` {
 }
 
 external interface `T$14` {
-    var repairing: Boolean
+    var repairing: Boolean?
     var position: Position
 }
 
 external interface LuaControl {
     fun get_inventory(inventory: inventory): LuaInventory?
     fun get_main_inventory(): LuaInventory?
-    fun can_insert(items: String): Boolean
-    fun can_insert(items: ItemStackDefinition): Boolean
-    fun can_insert(items: LuaItemStack): Boolean
+    fun can_insert(items: String): Boolean?
+    fun can_insert(items: ItemStackDefinition): Boolean?
+    fun can_insert(items: LuaItemStack): Boolean?
     fun insert(items: String): uint
     fun insert(items: ItemStackDefinition): uint
     fun insert(items: LuaItemStack): uint
@@ -392,16 +398,16 @@ external interface LuaControl {
     fun set_gui_arrow(params: OtherControlSetGuiArrow)
     fun clear_gui_arrow()
     fun get_item_count(item: String = definedExternally): uint
-    fun has_items_inside(): Boolean
-    fun can_reach_entity(entity: LuaEntity): Boolean
+    fun has_items_inside(): Boolean?
+    fun can_reach_entity(entity: LuaEntity): Boolean?
     fun clear_items_inside()
     fun remove_item(items: String): uint
     fun remove_item(items: ItemStackDefinition): uint
     fun remove_item(items: LuaItemStack): uint
-    fun teleport(position: Position, surface: uint = definedExternally): Boolean
-    fun teleport(position: Position): Boolean
-    fun teleport(position: Position, surface: String = definedExternally): Boolean
-    fun teleport(position: Position, surface: LuaSurface = definedExternally): Boolean
+    fun teleport(position: Position, surface: uint = definedExternally): Boolean?
+    fun teleport(position: Position): Boolean?
+    fun teleport(position: Position, surface: String = definedExternally): Boolean?
+    fun teleport(position: Position, surface: LuaSurface = definedExternally): Boolean?
     fun update_selected_entity(position: Position)
     fun clear_selected_entity()
     fun disable_flashlight()
@@ -411,22 +417,22 @@ external interface LuaControl {
     fun get_craftable_count(recipe: LuaRecipe): uint
     fun begin_crafting(params: `T$9`): uint
     fun cancel_crafting(params: `T$10`)
-    fun mine_entity(entity: LuaEntity, force: Boolean = definedExternally): Boolean
-    fun mine_tile(tile: LuaTile): Boolean
-    fun is_player(): Boolean
+    fun mine_entity(entity: LuaEntity, force: Boolean = definedExternally): Boolean?
+    fun mine_tile(tile: LuaTile): Boolean?
+    fun is_player(): Boolean?
     fun open_technology_gui(technology: String = definedExternally)
     fun open_technology_gui()
     fun open_technology_gui(technology: LuaTechnology = definedExternally)
     fun open_technology_gui(technology: LuaTechnologyPrototype = definedExternally)
-    fun set_personal_logistic_slot(slot_index: uint, value: PersonalLogisticParameters): Boolean
-    fun set_vehicle_logistic_slot(slot_index: uint, value: PersonalLogisticParameters): Boolean
+    fun set_personal_logistic_slot(slot_index: uint, value: PersonalLogisticParameters): Boolean?
+    fun set_vehicle_logistic_slot(slot_index: uint, value: PersonalLogisticParameters): Boolean?
     fun get_personal_logistic_slot(slot_index: uint): PersonalLogisticParameters
     fun get_vehicle_logistic_slot(slot_index: uint): PersonalLogisticParameters
     fun clear_personal_logistic_slot(slot_index: uint)
     fun clear_vehicle_logistic_slot(slot_index: uint)
-    fun is_cursor_blueprint(): Boolean
+    fun is_cursor_blueprint(): Boolean?
     fun get_blueprint_entities(): Array<BlueprintEntity>?
-    fun is_cursor_empty(): Boolean
+    fun is_cursor_empty(): Boolean?
     var surface: LuaSurface
     var position: PositionTable
     var vehicle: LuaEntity?
@@ -443,16 +449,16 @@ external interface LuaControl {
     var riding_state: RidingState
     var mining_state: `T$12`
     var shooting_state: `T$13`
-    var picking_state: Boolean
+    var picking_state: Boolean?
     var repair_state: `T$14`
     var cursor_stack: LuaItemStack?
     var cursor_ghost: dynamic /* LuaItemStack | LuaItemPrototype | String */
         get() = definedExternally
         set(value) = definedExternally
-    var driving: Boolean
+    var driving: Boolean?
     var crafting_queue: Array<CraftingQueueItem>
     var following_robots: Array<LuaEntity>
-    var cheat_mode: Boolean
+    var cheat_mode: Boolean?
     var character_crafting_speed_modifier: double
     var character_mining_speed_modifier: double
     var character_additional_mining_categories: Array<String>
@@ -467,8 +473,8 @@ external interface LuaControl {
     var character_trash_slot_count_bonus: uint
     var character_maximum_following_robot_count_bonus: uint
     var character_health_bonus: float
-    var character_personal_logistic_requests_enabled: Boolean
-    var vehicle_logistic_requests_enabled: Boolean
+    var character_personal_logistic_requests_enabled: Boolean?
+    var vehicle_logistic_requests_enabled: Boolean?
     var opened_gui_type: gui_type?
     var build_distance: uint
     var drop_item_distance: uint
@@ -476,7 +482,7 @@ external interface LuaControl {
     var item_pickup_distance: double
     var loot_pickup_distance: double
     var resource_reach_distance: double
-    var in_combat: Boolean
+    var in_combat: Boolean?
     var character_running_speed: double
     var character_mining_progress: double
 }
@@ -496,7 +502,7 @@ external interface LuaCustomChartTag {
     var tag_number: uint
     var force: LuaForce
     var surface: LuaSurface
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaCustomChartTag" */
     fun help(): String
 }
@@ -515,12 +521,12 @@ external interface LuaCustomInputPrototype {
     var linked_game_control: String?
     var consuming: String /* "none" | "game-only" */
     var action: String
-    var enabled: Boolean
-    var enabled_while_spectating: Boolean
-    var enabled_while_in_cutscene: Boolean
-    var include_selected_prototype: Boolean
+    var enabled: Boolean?
+    var enabled_while_spectating: Boolean?
+    var enabled_while_in_cutscene: Boolean?
+    var include_selected_prototype: Boolean?
     var item_to_spawn: LuaItemPrototype?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaCustomInputPrototype" */
     fun help(): String
 }
@@ -529,7 +535,7 @@ typealias CustomTableIndex<K, V> = Any
 
 external interface LuaCustomTableMembers {
     var length: () -> uint /* () -> uint & LuaExtension<String /* "__luaLengthMethodBrand" */> */
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaCustomTable" */
     fun help(): String
 }
@@ -543,15 +549,15 @@ external interface LuaDamagePrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var hidden: Boolean
-    var valid: Boolean
+    var hidden: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaDamagePrototype" */
     fun help(): String
 }
 
 external interface LuaDeciderCombinatorControlBehavior : LuaCombinatorControlBehavior {
     var parameters: DeciderCombinatorParameters
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaDeciderCombinatorControlBehavior" */
     fun help(): String
 }
@@ -569,7 +575,7 @@ external interface LuaDecorativePrototype {
     var collision_mask: CollisionMask
     var collision_mask_with_flags: CollisionMaskWithFlags
     var autoplace_specification: AutoplaceSpecification?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaDecorativePrototype" */
     fun help(): String
 }
@@ -581,9 +587,9 @@ external interface LuaElectricEnergySourcePrototype {
     var output_flow_limit: double
     var drain: double
     var emissions: double
-    var render_no_network_icon: Boolean
-    var render_no_power_icon: Boolean
-    var valid: Boolean
+    var render_no_network_icon: Boolean?
+    var render_no_power_icon: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaElectricEnergySourcePrototype" */
     fun help(): String
 }
@@ -702,8 +708,8 @@ external interface LuaEntity : LuaControl {
     fun damage(damage: float, force: LuaForce, type: String = definedExternally, dealer: LuaEntity = definedExternally): float
     fun damage(damage: float, force: LuaForce): float
     fun damage(damage: float, force: LuaForce, type: String = definedExternally): float
-    fun can_be_destroyed(): Boolean
-    fun destroy(params: `T$15` = definedExternally): Boolean
+    fun can_be_destroyed(): Boolean?
+    fun destroy(params: `T$15` = definedExternally): Boolean?
     fun set_command(command: AttackCommand)
     fun set_command(command: GoToLocationCommand)
     fun set_command(command: CompoundCommand)
@@ -722,32 +728,32 @@ external interface LuaEntity : LuaControl {
     fun set_distraction_command(command: StopCommand)
     fun set_distraction_command(command: FleeCommand)
     fun set_distraction_command(command: BuildBaseCommand)
-    fun has_command(): Boolean
-    fun die(force: String = definedExternally, cause: LuaEntity = definedExternally): Boolean
-    fun die(): Boolean
-    fun die(force: String = definedExternally): Boolean
-    fun die(force: LuaForce = definedExternally, cause: LuaEntity = definedExternally): Boolean
-    fun die(force: LuaForce = definedExternally): Boolean
-    fun has_flag(flag: String): Boolean
-    fun ghost_has_flag(flag: String): Boolean
+    fun has_command(): Boolean?
+    fun die(force: String = definedExternally, cause: LuaEntity = definedExternally): Boolean?
+    fun die(): Boolean?
+    fun die(force: String = definedExternally): Boolean?
+    fun die(force: LuaForce = definedExternally, cause: LuaEntity = definedExternally): Boolean?
+    fun die(force: LuaForce = definedExternally): Boolean?
+    fun has_flag(flag: String): Boolean?
+    fun ghost_has_flag(flag: String): Boolean?
     fun add_market_item(offer: Offer)
-    fun remove_market_item(offer: uint): Boolean
+    fun remove_market_item(offer: uint): Boolean?
     fun get_market_items(): Array<Offer>
     fun clear_market_items()
-    fun connect_neighbour(target: LuaEntity): Boolean
-    fun connect_neighbour(target: WireConnectionDefinition): Boolean
+    fun connect_neighbour(target: LuaEntity): Boolean?
+    fun connect_neighbour(target: WireConnectionDefinition): Boolean?
     fun disconnect_neighbour(target: wire_type = definedExternally)
     fun disconnect_neighbour()
     fun disconnect_neighbour(target: LuaEntity = definedExternally)
     fun disconnect_neighbour(target: WireConnectionDefinition = definedExternally)
-    fun order_deconstruction(force: String, player: uint = definedExternally): Boolean
-    fun order_deconstruction(force: String): Boolean
-    fun order_deconstruction(force: String, player: String = definedExternally): Boolean
-    fun order_deconstruction(force: String, player: LuaPlayer = definedExternally): Boolean
-    fun order_deconstruction(force: LuaForce, player: uint = definedExternally): Boolean
-    fun order_deconstruction(force: LuaForce): Boolean
-    fun order_deconstruction(force: LuaForce, player: String = definedExternally): Boolean
-    fun order_deconstruction(force: LuaForce, player: LuaPlayer = definedExternally): Boolean
+    fun order_deconstruction(force: String, player: uint = definedExternally): Boolean?
+    fun order_deconstruction(force: String): Boolean?
+    fun order_deconstruction(force: String, player: String = definedExternally): Boolean?
+    fun order_deconstruction(force: String, player: LuaPlayer = definedExternally): Boolean?
+    fun order_deconstruction(force: LuaForce, player: uint = definedExternally): Boolean?
+    fun order_deconstruction(force: LuaForce): Boolean?
+    fun order_deconstruction(force: LuaForce, player: String = definedExternally): Boolean?
+    fun order_deconstruction(force: LuaForce, player: LuaPlayer = definedExternally): Boolean?
     fun cancel_deconstruction(force: String, player: uint = definedExternally)
     fun cancel_deconstruction(force: String)
     fun cancel_deconstruction(force: String, player: String = definedExternally)
@@ -756,27 +762,27 @@ external interface LuaEntity : LuaControl {
     fun cancel_deconstruction(force: LuaForce)
     fun cancel_deconstruction(force: LuaForce, player: String = definedExternally)
     fun cancel_deconstruction(force: LuaForce, player: LuaPlayer = definedExternally)
-    fun to_be_deconstructed(): Boolean
-    fun order_upgrade(params: `T$16`): Boolean
-    fun cancel_upgrade(force: String, player: uint = definedExternally): Boolean
-    fun cancel_upgrade(force: String): Boolean
-    fun cancel_upgrade(force: String, player: String = definedExternally): Boolean
-    fun cancel_upgrade(force: String, player: LuaPlayer = definedExternally): Boolean
-    fun cancel_upgrade(force: LuaForce, player: uint = definedExternally): Boolean
-    fun cancel_upgrade(force: LuaForce): Boolean
-    fun cancel_upgrade(force: LuaForce, player: String = definedExternally): Boolean
-    fun cancel_upgrade(force: LuaForce, player: LuaPlayer = definedExternally): Boolean
-    fun to_be_upgraded(): Boolean
+    fun to_be_deconstructed(): Boolean?
+    fun order_upgrade(params: `T$16`): Boolean?
+    fun cancel_upgrade(force: String, player: uint = definedExternally): Boolean?
+    fun cancel_upgrade(force: String): Boolean?
+    fun cancel_upgrade(force: String, player: String = definedExternally): Boolean?
+    fun cancel_upgrade(force: String, player: LuaPlayer = definedExternally): Boolean?
+    fun cancel_upgrade(force: LuaForce, player: uint = definedExternally): Boolean?
+    fun cancel_upgrade(force: LuaForce): Boolean?
+    fun cancel_upgrade(force: LuaForce, player: String = definedExternally): Boolean?
+    fun cancel_upgrade(force: LuaForce, player: LuaPlayer = definedExternally): Boolean?
+    fun to_be_upgraded(): Boolean?
     fun get_request_slot(slot: uint): dynamic /* String? | ItemStackDefinition? */
-    fun set_request_slot(request: String, slot: uint): Boolean
-    fun set_request_slot(request: ItemStackDefinition, slot: uint): Boolean
-    fun set_request_slot(request: LuaItemStack, slot: uint): Boolean
+    fun set_request_slot(request: String, slot: uint): Boolean?
+    fun set_request_slot(request: ItemStackDefinition, slot: uint): Boolean?
+    fun set_request_slot(request: LuaItemStack, slot: uint): Boolean?
     fun clear_request_slot(slot: uint)
     fun is_crafting()
-    fun is_opened(): Boolean
-    fun is_opening(): Boolean
-    fun is_closed(): Boolean
-    fun is_closing(): Boolean
+    fun is_opened(): Boolean?
+    fun is_opening(): Boolean?
+    fun is_closed(): Boolean?
+    fun is_closing(): Boolean?
     fun request_to_open(force: String, extra_time: uint = definedExternally)
     fun request_to_open(force: String)
     fun request_to_open(force: LuaForce, extra_time: uint = definedExternally)
@@ -785,7 +791,7 @@ external interface LuaEntity : LuaControl {
     fun request_to_close(force: LuaForce)
     fun get_transport_line(index: uint): LuaTransportLine
     fun get_max_transport_line_index(): uint
-    fun launch_rocket(): Boolean
+    fun launch_rocket(): Boolean?
     fun revive(params: `T$17` = definedExternally): dynamic /* JsTuple<Nothing?> | JsTuple<Record<String, uint>, LuaEntity, LuaEntity?> */
     fun silent_revive(params: `T$17` = definedExternally): dynamic /* JsTuple<Nothing?> | JsTuple<Record<String, uint>, LuaEntity, LuaEntity?> */
     fun get_connected_rail(params: `T$18`): LuaEntity
@@ -807,20 +813,20 @@ external interface LuaEntity : LuaControl {
     fun get_circuit_network(wire: wire_type, circuit_connector: circuit_connector_id = definedExternally): LuaCircuitNetwork?
     fun get_merged_signal(signal: SignalID, circuit_connector: circuit_connector_id = definedExternally): int
     fun get_merged_signals(circuit_connector: circuit_connector_id = definedExternally): Array<Signal>?
-    fun supports_backer_name(): Boolean
+    fun supports_backer_name(): Boolean?
     fun copy_settings(entity: LuaEntity, by_player: uint = definedExternally): Record<String, uint>
     fun copy_settings(entity: LuaEntity): Record<String, uint>
     fun copy_settings(entity: LuaEntity, by_player: String = definedExternally): Record<String, uint>
     fun copy_settings(entity: LuaEntity, by_player: LuaPlayer = definedExternally): Record<String, uint>
     fun get_logistic_point(index: logistic_member_index = definedExternally): dynamic /* LuaLogisticPoint | Array<LuaLogisticPoint> */
-    fun play_note(instrument: uint, note: uint): Boolean
-    fun connect_rolling_stock(direction: rail_direction): Boolean
-    fun disconnect_rolling_stock(direction: rail_direction): Boolean
+    fun play_note(instrument: uint, note: uint): Boolean?
+    fun connect_rolling_stock(direction: rail_direction): Boolean?
+    fun disconnect_rolling_stock(direction: rail_direction): Boolean?
     fun update_connections()
     fun get_recipe(): LuaRecipe?
     fun set_recipe(recipe: String?): Record<String, uint>
     fun set_recipe(recipe: LuaRecipe?): Record<String, uint>
-    fun rotate(params: `T$19` = definedExternally): Boolean
+    fun rotate(params: `T$19` = definedExternally): Boolean?
     fun get_driver(): dynamic /* LuaEntity? | LuaPlayer? */
     fun set_driver(driver: LuaEntity?)
     fun set_driver(driver: uint?)
@@ -831,7 +837,7 @@ external interface LuaEntity : LuaControl {
     fun set_passenger(passenger: uint)
     fun set_passenger(passenger: String)
     fun set_passenger(passenger: LuaPlayer)
-    fun is_connected_to_electric_network(): Boolean
+    fun is_connected_to_electric_network(): Boolean?
     fun get_train_stop_trains(): Array<LuaTrain>
     fun get_stopped_train(): LuaTrain?
     fun clone(params: `T$20`): LuaEntity?
@@ -851,21 +857,21 @@ external interface LuaEntity : LuaControl {
     fun create_build_effect_smoke()
     fun release_from_spawner()
     fun toggle_equipment_movement_bonus()
-    fun can_shoot(target: LuaEntity, position: Position): Boolean
+    fun can_shoot(target: LuaEntity, position: Position): Boolean?
     fun start_fading_out()
     fun get_upgrade_target(): LuaEntityPrototype?
     fun get_upgrade_direction(): direction?
     fun get_damage_to_be_taken(): float
     fun deplete()
-    fun mine(params: `T$22` = definedExternally): Boolean
+    fun mine(params: `T$22` = definedExternally): Boolean?
     fun spawn_decorations()
-    fun can_wires_reach(entity: LuaEntity): Boolean
+    fun can_wires_reach(entity: LuaEntity): Boolean?
     fun get_connected_rolling_stock(direction: rail_direction): LuaEntity
-    fun is_registered_for_construction(): Boolean
-    fun is_registered_for_deconstruction(force: String): Boolean
-    fun is_registered_for_deconstruction(force: LuaForce): Boolean
-    fun is_registered_for_upgrade(): Boolean
-    fun is_registered_for_repair(): Boolean
+    fun is_registered_for_construction(): Boolean?
+    fun is_registered_for_deconstruction(force: String): Boolean?
+    fun is_registered_for_deconstruction(force: LuaForce): Boolean?
+    fun is_registered_for_upgrade(): Boolean?
+    fun is_registered_for_repair(): Boolean?
     fun add_autopilot_destination(position: Position)
     fun connect_linked_belts(neighbour: LuaEntity?)
     fun disconnect_linked_belts()
@@ -885,14 +891,14 @@ external interface LuaEntity : LuaControl {
         set(value) = definedExternally
     var type: String
     var ghost_type: String
-    var active: Boolean
-    var destructible: Boolean
-    var minable: Boolean
-    var rotatable: Boolean
-    var operable: Boolean
+    var active: Boolean?
+    var destructible: Boolean?
+    var minable: Boolean?
+    var rotatable: Boolean?
+    var operable: Boolean?
     var health: float?
     var direction: direction
-    var supports_direction: Boolean
+    var supports_direction: Boolean?
     var orientation: RealOrientation
     var cliff_orientation: String /* "west-to-east" | "north-to-south" | "east-to-west" | "south-to-north" | "west-to-north" | "north-to-east" | "east-to-south" | "south-to-west" | "west-to-south" | "north-to-west" | "east-to-north" | "south-to-east" | "west-to-none" | "none-to-east" | "east-to-none" | "none-to-west" | "north-to-none" | "none-to-south" | "south-to-none" | "none-to-north" */
     var relative_turret_orientation: RealOrientation?
@@ -902,7 +908,7 @@ external interface LuaEntity : LuaControl {
     var effectivity_modifier: float
     var consumption_modifier: float
     var friction_modifier: float
-    var driver_is_gunner: Boolean
+    var driver_is_gunner: Boolean?
     var vehicle_automatic_targeting_parameters: VehicleAutomaticTargetingParameters
     var speed: float
     var effective_speed: float
@@ -938,7 +944,7 @@ external interface LuaEntity : LuaControl {
         set(value) = definedExternally
     var signal_state: signal_state
     var chain_signal_state: chain_signal_state
-    var to_be_looted: Boolean
+    var to_be_looted: Boolean?
     var crafting_speed: double
     var crafting_progress: float
     var bonus_progress: double
@@ -998,10 +1004,10 @@ external interface LuaEntity : LuaControl {
     var products_finished: uint
     var spawner: LuaEntity?
     var units: Array<LuaEntity>
-    var power_switch_state: Boolean
+    var power_switch_state: Boolean?
     var effects: ModuleEffects?
     var infinity_container_filters: Array<InfinityInventoryFilter>
-    var remove_unfiltered_items: Boolean
+    var remove_unfiltered_items: Boolean?
     var character_corpse_player_index: uint
     var character_corpse_tick_of_death: uint
     var character_corpse_death_cause: dynamic /* JsTuple<String, Any> | String | Number */
@@ -1014,8 +1020,8 @@ external interface LuaEntity : LuaControl {
     var inserter_filter_mode: String /* "whitelist" | "blacklist" */
     var splitter_input_priority: String /* "left" | "none" | "right" */
     var splitter_output_priority: String /* "left" | "none" | "right" */
-    var armed: Boolean
-    var recipe_locked: Boolean
+    var armed: Boolean?
+    var recipe_locked: Boolean?
     var connected_rail: LuaEntity?
     var trains_in_block: uint
     var timeout: uint
@@ -1024,19 +1030,19 @@ external interface LuaEntity : LuaControl {
     var highlight_box_type: String
     var highlight_box_blink_interval: uint
     var status: entity_status?
-    var enable_logistics_while_moving: Boolean
+    var enable_logistics_while_moving: Boolean?
     var render_player: LuaPlayer?
     var render_to_forces: Array<dynamic /* String | LuaForce */>?
     var pump_rail_target: LuaEntity?
-    var moving: Boolean
+    var moving: Boolean?
     var electric_network_id: uint?
-    var allow_dispatching_robots: Boolean
-    var auto_launch: Boolean
+    var allow_dispatching_robots: Boolean?
+    var auto_launch: Boolean?
     var energy_generated_last_tick: double
     var storage_filter: LuaItemPrototype
-    var request_from_buffers: Boolean
-    var corpse_expires: Boolean
-    var corpse_immune_to_entity_placement: Boolean
+    var request_from_buffers: Boolean?
+    var corpse_expires: Boolean?
+    var corpse_immune_to_entity_placement: Boolean?
     var tags: Tags?
     var command: dynamic /* AttackCommand? | GoToLocationCommand? | CompoundCommand? | GroupCommand? | AttackAreaCommand? | WanderCommand? | StopCommand? | FleeCommand? | BuildBaseCommand? */
         get() = definedExternally
@@ -1049,22 +1055,22 @@ external interface LuaEntity : LuaControl {
     var autopilot_destinations: Array<PositionTable>
     var trains_count: uint?
     var trains_limit: uint
-    var is_entity_with_force: Boolean
-    var is_entity_with_owner: Boolean
-    var is_entity_with_health: Boolean
+    var is_entity_with_force: Boolean?
+    var is_entity_with_owner: Boolean?
+    var is_entity_with_health: Boolean?
     var combat_robot_owner: LuaEntity
     var link_id: uint
     var follow_target: LuaEntity
     var follow_offset: Position?
     var linked_belt_type: String /* "input" | "output" */
     var linked_belt_neighbour: LuaEntity?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaEntity" */
     fun help(): String
 }
 
 external interface `T$24` {
-    var minable: Boolean
+    var minable: Boolean?
     var mining_time: double
     var mining_particle: String?
         get() = definedExternally
@@ -1112,7 +1118,7 @@ external interface `T$26` {
 }
 
 external interface LuaEntityPrototype {
-    fun has_flag(flag: String /* "not-rotatable" | "placeable-neutral" | "placeable-player" | "placeable-enemy" | "placeable-off-grid" | "player-creation" | "filter-directions" | "fast-replaceable-no-build-while-moving" | "breaths-air" | "not-repairable" | "not-on-map" | "not-deconstructable" | "not-blueprintable" | "hide-from-bonus-gui" | "hide-alt-info" | "fast-replaceable-no-cross-type-while-moving" | "no-gap-fill-while-building" | "not-flammable" | "no-automated-item-removal" | "no-automated-item-insertion" | "not-upgradable" */): Boolean
+    fun has_flag(flag: String /* "not-rotatable" | "placeable-neutral" | "placeable-player" | "placeable-enemy" | "placeable-off-grid" | "player-creation" | "filter-directions" | "fast-replaceable-no-build-while-moving" | "breaths-air" | "not-repairable" | "not-on-map" | "not-deconstructable" | "not-blueprintable" | "hide-from-bonus-gui" | "hide-alt-info" | "fast-replaceable-no-cross-type-while-moving" | "no-gap-fill-while-building" | "not-flammable" | "no-automated-item-removal" | "no-automated-item-insertion" | "not-upgradable" */): Boolean?
     fun get_inventory_size(index: inventory): uint?
     var type: String
     var name: String
@@ -1145,7 +1151,7 @@ external interface LuaEntityPrototype {
     var healing_per_tick: float
     var emissions_per_second: double
     var corpses: Record<String, LuaEntityPrototype>
-    var selectable_in_game: Boolean
+    var selectable_in_game: Boolean?
     var selection_priority: uint
     var weight: double?
     var resistances: Record<String, Resistance>
@@ -1170,7 +1176,7 @@ external interface LuaEntityPrototype {
     var flags: EntityPrototypeFlags
     var remains_when_mined: Array<LuaEntityPrototype>
     var additional_pastable_entities: Array<LuaEntityPrototype>
-    var allow_copy_paste: Boolean
+    var allow_copy_paste: Boolean?
     var shooting_cursor_size: double
     var created_smoke: `T$26`?
     var created_effect: Array<TriggerItem>?
@@ -1221,9 +1227,9 @@ external interface LuaEntityPrototype {
     var fluid: LuaFluidPrototype?
     var fluid_capacity: double
     var pumping_speed: double?
-    var stack: Boolean
-    var allow_custom_vectors: Boolean
-    var allow_burner_leech: Boolean
+    var stack: Boolean?
+    var allow_custom_vectors: Boolean?
+    var allow_burner_leech: Boolean?
     var inserter_extension_speed: double?
     var inserter_rotation_speed: double?
     var inserter_pickup_position: dynamic /* typealias Vector = dynamic */
@@ -1233,7 +1239,7 @@ external interface LuaEntityPrototype {
         get() = definedExternally
         set(value) = definedExternally
     var inserter_chases_belt_items: Boolean?
-    var count_as_rock_for_filtered_deconstruction: Boolean
+    var count_as_rock_for_filtered_deconstruction: Boolean?
     var filter_count: uint?
     var time_to_live: uint
     var distribution_effectivity: double?
@@ -1243,9 +1249,9 @@ external interface LuaEntityPrototype {
     var alert_when_damaged: Boolean?
     var alert_when_attacking: Boolean?
     var color: ColorTable?
-    var collision_mask_collides_with_self: Boolean
-    var collision_mask_collides_with_tiles_only: Boolean
-    var collision_mask_considers_tile_transitions: Boolean
+    var collision_mask_collides_with_self: Boolean?
+    var collision_mask_collides_with_tiles_only: Boolean?
+    var collision_mask_considers_tile_transitions: Boolean?
     var allowed_effects: Record<String, Boolean>?
     var rocket_parts_required: uint?
     var rocket_rising_delay: uint8?
@@ -1260,7 +1266,7 @@ external interface LuaEntityPrototype {
     var construction_radius: double?
     var logistic_radius: double?
     var energy_per_hit_point: double?
-    var create_ghost_on_death: Boolean
+    var create_ghost_on_death: Boolean?
     var timeout: uint
     var fluidbox_prototypes: Array<LuaFluidBoxPrototype>
     var neighbour_bonus: double
@@ -1268,7 +1274,7 @@ external interface LuaEntityPrototype {
     var container_distance: double
     var belt_distance: double
     var belt_length: double
-    var is_building: Boolean
+    var is_building: Boolean?
     var automated_ammo_count: uint?
     var max_speed: double?
     var darkness_for_all_lamps_on: float?
@@ -1302,10 +1308,10 @@ external interface LuaEntityPrototype {
     var researching_speed: double?
     var item_slot_count: uint?
     var base_productivity: double?
-    var allow_access_to_all_forces: Boolean
-    var supports_direction: Boolean
+    var allow_access_to_all_forces: Boolean?
+    var supports_direction: Boolean?
     var terrain_friction_modifier: float
-    var allow_passengers: Boolean
+    var allow_passengers: Boolean?
     var max_distance_of_sector_revealed: uint
     var max_distance_of_nearby_sector_revealed: uint
     var adjacent_tile_collision_box: BoundingBoxTable
@@ -1330,7 +1336,7 @@ external interface LuaEntityPrototype {
     var respawn_time: uint
     var damage_hit_tint: ColorTable
     var character_corpse: LuaEntityPrototype
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaEntityPrototype" */
     fun help(): String
 }
@@ -1354,7 +1360,7 @@ external interface LuaEquipment {
     var max_energy: double
     var prototype: LuaEquipmentPrototype
     var burner: LuaBurner?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaEquipment" */
     fun help(): String
 }
@@ -1368,7 +1374,7 @@ external interface LuaEquipmentCategoryPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaEquipmentCategoryPrototype" */
     fun help(): String
 }
@@ -1411,8 +1417,8 @@ external interface LuaEquipmentGrid {
     fun clear(by_player: String = definedExternally)
     fun clear(by_player: LuaPlayer = definedExternally)
     fun put(params: `T$29`): LuaEquipment?
-    fun can_move(params: `T$30`): Boolean
-    fun move(params: `T$30`): Boolean
+    fun can_move(params: `T$30`): Boolean?
+    fun move(params: `T$30`): Boolean?
     fun get(position: Position): LuaEquipment?
     fun get_contents(): Record<String, uint>
     var prototype: LuaEquipmentGridPrototype
@@ -1425,8 +1431,8 @@ external interface LuaEquipmentGrid {
     var battery_capacity: double
     var shield: float
     var max_shield: float
-    var inhibit_movement_bonus: Boolean
-    var valid: Boolean
+    var inhibit_movement_bonus: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaEquipmentGrid" */
     fun help(): String
 }
@@ -1443,8 +1449,8 @@ external interface LuaEquipmentGridPrototype {
     var equipment_categories: Array<String>
     var width: uint
     var height: uint
-    var locked: Boolean
-    var valid: Boolean
+    var locked: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaEquipmentGridPrototype" */
     fun help(): String
 }
@@ -1476,7 +1482,7 @@ external interface `T$32` {
         set(value) = definedExternally
     var robot_limit: uint
     var logistics_connection_distance: float
-    var robots_shrink_when_entering_and_exiting: Boolean
+    var robots_shrink_when_entering_and_exiting: Boolean?
 }
 
 external interface LuaEquipmentPrototype {
@@ -1505,15 +1511,15 @@ external interface LuaEquipmentPrototype {
     var attack_parameters: dynamic /* ProjectileAttackParameters? | StreamAttackParameters? | OtherAttackParameters? */
         get() = definedExternally
         set(value) = definedExternally
-    var automatic: Boolean
-    var valid: Boolean
+    var automatic: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaEquipmentPrototype" */
     fun help(): String
 }
 
 external interface `T$33` {
     var name: String
-    var input: Boolean
+    var input: Boolean?
     var precision_index: flow_precision_index
     var count: Boolean?
         get() = definedExternally
@@ -1531,7 +1537,7 @@ external interface LuaFlowStatistics {
     var input_counts: Record<String, dynamic /* uint64 | double */>
     var output_counts: Record<String, dynamic /* uint64 | double */>
     var force: LuaForce?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaFlowStatistics" */
     fun help(): String
 }
@@ -1552,23 +1558,23 @@ external interface LuaFluidBoxPrototype {
     var maximum_temperature: double?
     var secondary_draw_orders: Array<int>
     var render_layer: String
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaFluidBoxPrototype" */
     fun help(): String
 }
 
 external interface LuaFluidEnergySourcePrototype {
     var emissions: double
-    var render_no_network_icon: Boolean
-    var render_no_power_icon: Boolean
+    var render_no_network_icon: Boolean?
+    var render_no_power_icon: Boolean?
     var effectivity: double
-    var burns_fluid: Boolean
-    var scale_fluid_usage: Boolean
+    var burns_fluid: Boolean?
+    var scale_fluid_usage: Boolean?
     var fluid_usage_per_tick: double
     var smoke: Array<SmokeSource>
     var maximum_temperature: double
     var fluid_box: LuaFluidBoxPrototype
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaFluidEnergySourcePrototype" */
     fun help(): String
 }
@@ -1592,8 +1598,8 @@ external interface LuaFluidPrototype {
     var gas_temperature: double
     var emissions_multiplier: double
     var fuel_value: double
-    var hidden: Boolean
-    var valid: Boolean
+    var hidden: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaFluidPrototype" */
     fun help(): String
 }
@@ -1603,10 +1609,10 @@ external interface LuaFontPrototype {
     var from: String
     var size: int
     var spacing: float
-    var border: Boolean
-    var filtered: Boolean
+    var border: Boolean?
+    var filtered: Boolean?
     var border_color: ColorTable?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaFontPrototype" */
     fun help(): String
 }
@@ -1663,18 +1669,18 @@ external interface LuaForce {
     fun chart_all()
     fun chart_all(surface: String = definedExternally)
     fun chart_all(surface: LuaSurface = definedExternally)
-    fun is_chunk_charted(surface: uint, position: ChunkPositionTable): Boolean
-    fun is_chunk_charted(surface: uint, position: Any /* JsTuple<x, int, y, int> */): Boolean
-    fun is_chunk_charted(surface: String, position: ChunkPositionTable): Boolean
-    fun is_chunk_charted(surface: String, position: Any /* JsTuple<x, int, y, int> */): Boolean
-    fun is_chunk_charted(surface: LuaSurface, position: ChunkPositionTable): Boolean
-    fun is_chunk_charted(surface: LuaSurface, position: Any /* JsTuple<x, int, y, int> */): Boolean
-    fun is_chunk_visible(surface: uint, position: ChunkPositionTable): Boolean
-    fun is_chunk_visible(surface: uint, position: Any /* JsTuple<x, int, y, int> */): Boolean
-    fun is_chunk_visible(surface: String, position: ChunkPositionTable): Boolean
-    fun is_chunk_visible(surface: String, position: Any /* JsTuple<x, int, y, int> */): Boolean
-    fun is_chunk_visible(surface: LuaSurface, position: ChunkPositionTable): Boolean
-    fun is_chunk_visible(surface: LuaSurface, position: Any /* JsTuple<x, int, y, int> */): Boolean
+    fun is_chunk_charted(surface: uint, position: ChunkPositionTable): Boolean?
+    fun is_chunk_charted(surface: uint, position: Any /* JsTuple<x, int, y, int> */): Boolean?
+    fun is_chunk_charted(surface: String, position: ChunkPositionTable): Boolean?
+    fun is_chunk_charted(surface: String, position: Any /* JsTuple<x, int, y, int> */): Boolean?
+    fun is_chunk_charted(surface: LuaSurface, position: ChunkPositionTable): Boolean?
+    fun is_chunk_charted(surface: LuaSurface, position: Any /* JsTuple<x, int, y, int> */): Boolean?
+    fun is_chunk_visible(surface: uint, position: ChunkPositionTable): Boolean?
+    fun is_chunk_visible(surface: uint, position: Any /* JsTuple<x, int, y, int> */): Boolean?
+    fun is_chunk_visible(surface: String, position: ChunkPositionTable): Boolean?
+    fun is_chunk_visible(surface: String, position: Any /* JsTuple<x, int, y, int> */): Boolean?
+    fun is_chunk_visible(surface: LuaSurface, position: ChunkPositionTable): Boolean?
+    fun is_chunk_visible(surface: LuaSurface, position: Any /* JsTuple<x, int, y, int> */): Boolean?
     fun cancel_charting(surface: uint = definedExternally)
     fun cancel_charting()
     fun cancel_charting(surface: String = definedExternally)
@@ -1687,13 +1693,13 @@ external interface LuaForce {
     fun set_turret_attack_modifier(turret: String, modifier: double)
     fun set_cease_fire(other: String, cease_fire: Boolean)
     fun set_cease_fire(other: LuaForce, cease_fire: Boolean)
-    fun get_cease_fire(other: String): Boolean
-    fun get_cease_fire(other: LuaForce): Boolean
+    fun get_cease_fire(other: String): Boolean?
+    fun get_cease_fire(other: LuaForce): Boolean?
     fun set_friend(other: String, friend: Boolean)
     fun set_friend(other: LuaForce, friend: Boolean)
-    fun get_friend(other: String): Boolean
-    fun get_friend(other: LuaForce): Boolean
-    fun is_pathfinder_busy(): Boolean
+    fun get_friend(other: String): Boolean?
+    fun get_friend(other: LuaForce): Boolean?
+    fun is_pathfinder_busy(): Boolean?
     fun kill_all_units()
     fun find_logistic_network_by_position(position: Position, surface: uint): LuaLogisticNetwork?
     fun find_logistic_network_by_position(position: Position, surface: String): LuaLogisticNetwork?
@@ -1746,21 +1752,21 @@ external interface LuaForce {
     fun reset_evolution()
     fun play_sound(params: `T$34`)
     fun get_train_stops(params: `T$35` = definedExternally): Array<LuaEntity>
-    fun get_hand_crafting_disabled_for_recipe(recipe: String): Boolean
-    fun get_hand_crafting_disabled_for_recipe(recipe: LuaRecipe): Boolean
+    fun get_hand_crafting_disabled_for_recipe(recipe: String): Boolean?
+    fun get_hand_crafting_disabled_for_recipe(recipe: LuaRecipe): Boolean?
     fun set_hand_crafting_disabled_for_recipe(recipe: String, hand_crafting_disabled: Boolean)
     fun set_hand_crafting_disabled_for_recipe(recipe: LuaRecipe, hand_crafting_disabled: Boolean)
-    fun add_research(technology: String): Boolean
-    fun add_research(technology: LuaTechnology): Boolean
-    fun add_research(technology: LuaTechnologyPrototype): Boolean
+    fun add_research(technology: String): Boolean?
+    fun add_research(technology: LuaTechnology): Boolean?
+    fun add_research(technology: LuaTechnologyPrototype): Boolean?
     fun cancel_current_research()
     fun get_linked_inventory(prototype: LuaEntity, link_id: uint): LuaInventory?
     fun get_linked_inventory(prototype: LuaEntityPrototype, link_id: uint): LuaInventory?
     fun get_linked_inventory(prototype: String, link_id: uint): LuaInventory?
-    fun is_friend(other: String): Boolean
-    fun is_friend(other: LuaForce): Boolean
-    fun is_enemy(other: String): Boolean
-    fun is_enemy(other: LuaForce): Boolean
+    fun is_friend(other: String): Boolean?
+    fun is_friend(other: LuaForce): Boolean?
+    fun is_enemy(other: String): Boolean?
+    fun is_enemy(other: LuaForce): Boolean?
     var name: String
     var technologies: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<String, LuaTechnology> */
     var recipes: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<String, LuaRecipe> */
@@ -1781,7 +1787,7 @@ external interface LuaForce {
     var following_robots_lifetime_modifier: double
     var ghost_time_to_live: uint
     var players: Array<LuaPlayer>
-    var ai_controllable: Boolean
+    var ai_controllable: Boolean?
     var logistic_networks: Record<String, Array<LuaLogisticNetwork>>
     var item_production_statistics: LuaFlowStatistics
     var fluid_production_statistics: LuaFlowStatistics
@@ -1800,12 +1806,12 @@ external interface LuaForce {
     var character_health_bonus: double
     var max_successful_attempts_per_tick_per_construction_queue: uint
     var max_failed_attempts_per_tick_per_construction_queue: uint
-    var zoom_to_world_enabled: Boolean
-    var zoom_to_world_ghost_building_enabled: Boolean
-    var zoom_to_world_blueprint_enabled: Boolean
-    var zoom_to_world_deconstruction_planner_enabled: Boolean
-    var zoom_to_world_selection_tool_enabled: Boolean
-    var character_logistic_requests: Boolean
+    var zoom_to_world_enabled: Boolean?
+    var zoom_to_world_ghost_building_enabled: Boolean?
+    var zoom_to_world_blueprint_enabled: Boolean?
+    var zoom_to_world_deconstruction_planner_enabled: Boolean?
+    var zoom_to_world_selection_tool_enabled: Boolean?
+    var character_logistic_requests: Boolean?
     var rockets_launched: uint
     var items_launched: Record<String, uint>
     var connected_players: Array<LuaPlayer>
@@ -1815,13 +1821,13 @@ external interface LuaForce {
     var evolution_factor_by_pollution: double
     var evolution_factor_by_time: double
     var evolution_factor_by_killing_spawners: double
-    var friendly_fire: Boolean
-    var share_chart: Boolean
-    var research_queue_enabled: Boolean
+    var friendly_fire: Boolean?
+    var share_chart: Boolean?
+    var research_queue_enabled: Boolean?
     var index: uint
     var research_queue: Array<dynamic /* String | LuaTechnology | LuaTechnologyPrototype */>?
-    var research_enabled: Boolean
-    var valid: Boolean
+    var research_enabled: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaForce" */
     fun help(): String
 }
@@ -1835,16 +1841,16 @@ external interface LuaFuelCategoryPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaFuelCategoryPrototype" */
     fun help(): String
 }
 
 external interface `T$36` {
-    var game_finished: Boolean
-    var player_won: Boolean
+    var game_finished: Boolean?
+    var player_won: Boolean?
     var next_level: String
-    var can_continue: Boolean
+    var can_continue: Boolean?
     var victorious_force: dynamic /* String | LuaForce */
         get() = definedExternally
         set(value) = definedExternally
@@ -1956,7 +1962,7 @@ external interface LuaGameScript {
     fun set_game_state(params: `T$36`)
     fun get_entity_by_tag(tag: String): LuaEntity
     fun show_message_dialog(params: `T$37`)
-    fun is_demo(): Boolean
+    fun is_demo(): Boolean?
     fun reload_script()
     fun reload_mods()
     fun save_atlas()
@@ -2005,10 +2011,10 @@ external interface LuaGameScript {
     fun create_random_generator(seed: uint = definedExternally): LuaRandomGenerator
     fun check_prototype_translations()
     fun play_sound(params: `T$34`)
-    fun is_valid_sound_path(sound_path: String): Boolean
-    fun is_valid_sound_path(sound_path: ): Boolean
-    fun is_valid_sprite_path(sprite_path: String): Boolean
-    fun is_valid_sprite_path(sprite_path: ): Boolean
+    fun is_valid_sound_path(sound_path: String): Boolean?
+//    fun is_valid_sound_path(sound_path: String): Boolean?
+    fun is_valid_sprite_path(sprite_path: String): Boolean?
+//    fun is_valid_sprite_path(sprite_path: String): Boolean?
     fun kick_player(player: uint, reason: Any /* JsTuple<String, Any> */ = definedExternally)
     fun kick_player(player: uint)
     fun kick_player(player: uint, reason: String = definedExternally)
@@ -2046,7 +2052,7 @@ external interface LuaGameScript {
     fun unmute_player(player: String)
     fun unmute_player(player: LuaPlayer)
     fun count_pipe_groups()
-    fun is_multiplayer(): Boolean
+    fun is_multiplayer(): Boolean?
     fun get_active_entities_count(surface: uint = definedExternally): uint
     fun get_active_entities_count(): uint
     fun get_active_entities_count(surface: String = definedExternally): uint
@@ -2114,9 +2120,9 @@ external interface LuaGameScript {
     var styles: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<String, String> */
     var tick: uint
     var ticks_played: uint
-    var tick_paused: Boolean
+    var tick_paused: Boolean?
     var ticks_to_run: uint
-    var finished: Boolean
+    var finished: Boolean?
     var speed: float
     var surfaces: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<dynamic /* uint | String */, LuaSurface> */
     var active_mods: Record<String, String>
@@ -2124,9 +2130,9 @@ external interface LuaGameScript {
     var permissions: LuaPermissionGroups
     var backer_names: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<uint, String> */
     var default_map_gen_settings: MapGenSettings
-    var enemy_has_vision_on_land_mines: Boolean
-    var autosave_enabled: Boolean
-    var draw_resource_selection: Boolean
+    var enemy_has_vision_on_land_mines: Boolean?
+    var autosave_enabled: Boolean?
+    var draw_resource_selection: Boolean?
     var pollution_statistics: LuaFlowStatistics
     var max_force_distraction_distance: double
     var max_force_distraction_chunk_distance: uint
@@ -2141,11 +2147,11 @@ external interface LuaGameScript {
 }
 
 external interface LuaGenericOnOffControlBehavior : LuaControlBehavior {
-    var disabled: Boolean
+    var disabled: Boolean?
     var circuit_condition: CircuitConditionDefinition
     var logistic_condition: CircuitConditionDefinition
-    var connect_to_logistic_network: Boolean
-    var valid: Boolean
+    var connect_to_logistic_network: Boolean?
+    var valid: Boolean?
     var object_name: String
     fun help(): String
 }
@@ -2160,14 +2166,14 @@ external interface LuaGroup {
     var subgroups: Array<LuaGroup>
     var order_in_recipe: String
     var order: String
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaGroup" */
     fun help(): String
 }
 
 external interface LuaGui {
-    fun is_valid_sprite_path(sprite_path: String): Boolean
-    fun is_valid_sprite_path(sprite_path: ): Boolean
+    fun is_valid_sprite_path(sprite_path: String): Boolean?
+//    fun is_valid_sprite_path(sprite_path: ): Boolean?
     var player: LuaPlayer
     var children: Record<String, dynamic /* ChooseElemButtonGuiElementMembers | DropDownGuiElementMembers | EmptyWidgetGuiElementMembers | EntityPreviewGuiElementMembers | ListBoxGuiElementMembers | ScrollPaneGuiElementMembers | SpriteButtonGuiElementMembers | TabbedPaneGuiElementMembers | TextBoxGuiElementMembers | ButtonGuiElementMembers | CameraGuiElementMembers | CheckboxGuiElementMembers | FlowGuiElementMembers | FrameGuiElementMembers | LabelGuiElementMembers | LineGuiElementMembers | MinimapGuiElementMembers | ProgressbarGuiElementMembers | RadiobuttonGuiElementMembers | SliderGuiElementMembers | SpriteGuiElementMembers | SwitchGuiElementMembers | TabGuiElementMembers | TableGuiElementMembers | TextfieldGuiElementMembers */>
     var top: dynamic /* ChooseElemButtonGuiElementMembers | DropDownGuiElementMembers | EmptyWidgetGuiElementMembers | EntityPreviewGuiElementMembers | ListBoxGuiElementMembers | ScrollPaneGuiElementMembers | SpriteButtonGuiElementMembers | TabbedPaneGuiElementMembers | TextBoxGuiElementMembers | ButtonGuiElementMembers | CameraGuiElementMembers | CheckboxGuiElementMembers | FlowGuiElementMembers | FrameGuiElementMembers | LabelGuiElementMembers | LineGuiElementMembers | MinimapGuiElementMembers | ProgressbarGuiElementMembers | RadiobuttonGuiElementMembers | SliderGuiElementMembers | SpriteGuiElementMembers | SwitchGuiElementMembers | TabGuiElementMembers | TableGuiElementMembers | TextfieldGuiElementMembers */
@@ -2188,7 +2194,7 @@ external interface LuaGui {
     var relative: dynamic /* ChooseElemButtonGuiElementMembers | DropDownGuiElementMembers | EmptyWidgetGuiElementMembers | EntityPreviewGuiElementMembers | ListBoxGuiElementMembers | ScrollPaneGuiElementMembers | SpriteButtonGuiElementMembers | TabbedPaneGuiElementMembers | TextBoxGuiElementMembers | ButtonGuiElementMembers | CameraGuiElementMembers | CheckboxGuiElementMembers | FlowGuiElementMembers | FrameGuiElementMembers | LabelGuiElementMembers | LineGuiElementMembers | MinimapGuiElementMembers | ProgressbarGuiElementMembers | RadiobuttonGuiElementMembers | SliderGuiElementMembers | SpriteGuiElementMembers | SwitchGuiElementMembers | TabGuiElementMembers | TableGuiElementMembers | TextfieldGuiElementMembers */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaGui" */
     fun help(): String
 }
@@ -2299,12 +2305,12 @@ external interface ProgressbarGuiSpec : BaseGuiSpec {
 
 external interface CheckboxGuiSpec : BaseGuiSpec {
     override var type: String /* "checkbox" */
-    var state: Boolean
+    var state: Boolean?
 }
 
 external interface RadiobuttonGuiSpec : BaseGuiSpec {
     override var type: String /* "radiobutton" */
-    var state: Boolean
+    var state: Boolean?
 }
 
 external interface SpriteButtonGuiSpec : BaseGuiSpec {
@@ -2407,7 +2413,7 @@ external interface ChooseElemButtonFilters {
 external interface BaseChooseElemButtonSpec : BaseGuiSpec {
     override var type: String /* "choose-elem-button" */
     var elem_type: String /* "item" | "tile" | "entity" | "signal" | "fluid" | "recipe" | "decorative" | "item-group" | "achievement" | "equipment" | "technology" */
-    var filters: Any
+    var filters: Any?
         get() = definedExternally
         set(value) = definedExternally
 }
@@ -2655,8 +2661,8 @@ external interface BaseGuiElement {
     fun get_slider_maximum(): double
     fun set_slider_minimum_maximum(minimum: double, maximum: double)
     fun get_slider_value_step(): double
-    fun get_slider_discrete_slider(): Boolean
-    fun get_slider_discrete_values(): Boolean
+    fun get_slider_discrete_slider(): Boolean?
+    fun get_slider_discrete_values(): Boolean?
     fun set_slider_value_step(value: double)
     fun set_slider_discrete_slider(value: Boolean)
     fun set_slider_discrete_values(value: Boolean)
@@ -2674,13 +2680,13 @@ external interface BaseGuiElement {
     var style: dynamic /* LuaStyle | String */
         get() = definedExternally
         set(value) = definedExternally
-    var visible: Boolean
+    var visible: Boolean?
     var children_names: Array<String>
     var player_index: uint
     var sprite: dynamic /* String |  */
         get() = definedExternally
         set(value) = definedExternally
-    var resize_to_sprite: Boolean
+    var resize_to_sprite: Boolean?
     var clicked_sprite: dynamic /* String |  */
         get() = definedExternally
         set(value) = definedExternally
@@ -2692,7 +2698,7 @@ external interface BaseGuiElement {
     var items: Array<dynamic /* JsTuple<String, Any> | String | Number */>
     var selected_index: uint
     var number: double?
-    var show_percent_for_small_numbers: Boolean
+    var show_percent_for_small_numbers: Boolean?
     var location: dynamic /* GuiLocationTable? | JsTuple<x, int, y, int> */
         get() = definedExternally
         set(value) = definedExternally
@@ -2700,8 +2706,8 @@ external interface BaseGuiElement {
     var surface_index: uint
     var zoom: double
     var force: String?
-    var enabled: Boolean
-    var ignored_by_interaction: Boolean
+    var enabled: Boolean?
+    var ignored_by_interaction: Boolean?
     var mouse_button_filter: dynamic /* MouseButtonFlagsTable | MouseButtonFlagsArray */
         get() = definedExternally
         set(value) = definedExternally
@@ -2712,7 +2718,7 @@ external interface BaseGuiElement {
     var entity: LuaEntity?
     var anchor: GuiAnchor?
     var tags: Tags
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaGuiElement" */
     fun help(): String
 }
@@ -2722,7 +2728,7 @@ external interface ChooseElemButtonGuiElementMembers : BaseGuiElement {
     var elem_type: String /* "item" | "tile" | "entity" | "signal" | "fluid" | "recipe" | "decorative" | "item-group" | "achievement" | "equipment" | "technology" */
     var elem_value: Any?
     var elem_filters: Any
-    var locked: Boolean
+    var locked: Boolean?
 }
 
 external interface DropDownGuiElementMembers : BaseGuiElement {
@@ -2776,10 +2782,10 @@ external interface TextBoxGuiElementMembers : BaseGuiElement {
     fun select_all()
     fun select(start: int, end: int)
     var text: String
-    var selectable: Boolean
-    var word_wrap: Boolean
-    var read_only: Boolean
-    var clear_and_focus_on_right_click: Boolean
+    var selectable: Boolean?
+    var word_wrap: Boolean?
+    var read_only: Boolean?
+    var clear_and_focus_on_right_click: Boolean?
 }
 
 external interface ButtonGuiElementMembers : BaseGuiElement {
@@ -2792,7 +2798,7 @@ external interface CameraGuiElementMembers : BaseGuiElement {
 
 external interface CheckboxGuiElementMembers : BaseGuiElement {
     override var type: String /* "checkbox" */
-    var state: Boolean
+    var state: Boolean?
 }
 
 external interface FlowGuiElementMembers : BaseGuiElement {
@@ -2804,7 +2810,7 @@ external interface FrameGuiElementMembers : BaseGuiElement {
     override var type: String /* "frame" */
     fun force_auto_center()
     var direction: String /* "horizontal" | "vertical" */
-    var auto_center: Boolean
+    var auto_center: Boolean?
 }
 
 external interface LabelGuiElementMembers : BaseGuiElement {
@@ -2828,7 +2834,7 @@ external interface ProgressbarGuiElementMembers : BaseGuiElement {
 
 external interface RadiobuttonGuiElementMembers : BaseGuiElement {
     override var type: String /* "radiobutton" */
-    var state: Boolean
+    var state: Boolean?
 }
 
 external interface SliderGuiElementMembers : BaseGuiElement {
@@ -2843,7 +2849,7 @@ external interface SpriteGuiElementMembers : BaseGuiElement {
 external interface SwitchGuiElementMembers : BaseGuiElement {
     override var type: String /* "switch" */
     var switch_state: String
-    var allow_none_state: Boolean
+    var allow_none_state: Boolean?
     var left_label_caption: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
@@ -2867,11 +2873,11 @@ external interface TabGuiElementMembers : BaseGuiElement {
 
 external interface TableGuiElementMembers : BaseGuiElement {
     override var type: String /* "table" */
-    var draw_vertical_lines: Boolean
-    var draw_horizontal_lines: Boolean
-    var draw_horizontal_line_after_headers: Boolean
+    var draw_vertical_lines: Boolean?
+    var draw_horizontal_lines: Boolean?
+    var draw_horizontal_line_after_headers: Boolean?
     var column_count: uint
-    var vertical_centering: Boolean
+    var vertical_centering: Boolean?
 }
 
 external interface TextfieldGuiElementMembers : BaseGuiElement {
@@ -2879,18 +2885,18 @@ external interface TextfieldGuiElementMembers : BaseGuiElement {
     fun select_all()
     fun select(start: int, end: int)
     var text: String
-    var numeric: Boolean
-    var allow_decimal: Boolean
-    var allow_negative: Boolean
-    var is_password: Boolean
-    var lose_focus_on_confirm: Boolean
-    var clear_and_focus_on_right_click: Boolean
+    var numeric: Boolean?
+    var allow_decimal: Boolean?
+    var allow_negative: Boolean?
+    var is_password: Boolean?
+    var lose_focus_on_confirm: Boolean?
+    var clear_and_focus_on_right_click: Boolean?
 }
 
 external interface LuaHeatEnergySourcePrototype {
     var emissions: double
-    var render_no_network_icon: Boolean
-    var render_no_power_icon: Boolean
+    var render_no_network_icon: Boolean?
+    var render_no_power_icon: Boolean?
     var max_temperature: double
     var default_temperature: double
     var specific_heat: double
@@ -2899,18 +2905,18 @@ external interface LuaHeatEnergySourcePrototype {
     var min_working_temperature: double
     var minimum_glow_temperature: double
     var connections: Array<HeatConnection>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaHeatEnergySourcePrototype" */
     fun help(): String
 }
 
 external interface LuaInserterControlBehavior : LuaGenericOnOffControlBehavior {
-    var circuit_read_hand_contents: Boolean
+    var circuit_read_hand_contents: Boolean?
     var circuit_mode_of_operation: circuit_mode_of_operation
     var circuit_hand_read_mode: hand_read_mode
-    var circuit_set_stack_size: Boolean
+    var circuit_set_stack_size: Boolean?
     var circuit_stack_control_signal: SignalID
-    override var valid: Boolean
+    override var valid: Boolean?
     override var object_name: String /* "LuaInserterControlBehavior" */
     override fun help(): String
 }
@@ -2918,7 +2924,7 @@ external interface LuaInserterControlBehavior : LuaGenericOnOffControlBehavior {
 typealias LuaInventory = Array<LuaItemStack>
 
 external interface LuaItemPrototype {
-    fun has_flag(flag: String): Boolean
+    fun has_flag(flag: String): Boolean?
     fun get_ammo_type(ammo_source_type: String /* "default" | "player" | "turret" | "vehicle" */ = definedExternally): AmmoType?
     var type: String /* "gun" | "mining-tool" */
     var name: String
@@ -2932,7 +2938,7 @@ external interface LuaItemPrototype {
     var place_result: LuaEntityPrototype?
     var place_as_equipment_result: LuaEquipmentPrototype?
     var place_as_tile_result: PlaceAsTileResult?
-    var stackable: Boolean
+    var stackable: Boolean?
     var default_request_amount: uint
     var stack_size: uint
     var wire_count: uint
@@ -2946,7 +2952,7 @@ external interface LuaItemPrototype {
     var group: LuaGroup
     var flags: ItemPrototypeFlags
     var rocket_launch_products: Array<dynamic /* FluidProduct | OtherProduct */>
-    var can_be_mod_opened: Boolean
+    var can_be_mod_opened: Boolean?
     var magazine_size: float?
     var reload_time: float?
     var equipment_grid: LuaEquipmentGridPrototype?
@@ -2965,9 +2971,9 @@ external interface LuaItemPrototype {
     var localised_filter_message: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var extend_inventory_by_default: Boolean
+    var extend_inventory_by_default: Boolean?
     var default_label_color: ColorTable?
-    var draw_label_for_cursor_render: Boolean
+    var draw_label_for_cursor_render: Boolean?
     var speed: float?
     var module_effects: ModuleEffects?
     var category: String
@@ -2983,7 +2989,7 @@ external interface LuaItemPrototype {
     var alt_selection_mode_flags: SelectionModeFlags
     var selection_cursor_box_type: String
     var alt_selection_cursor_box_type: String
-    var always_include_tiles: Boolean
+    var always_include_tiles: Boolean?
     var entity_filter_mode: String
     var alt_entity_filter_mode: String
     var tile_filter_mode: String
@@ -3000,7 +3006,7 @@ external interface LuaItemPrototype {
     var durability: double?
     var infinite: Boolean?
     var mapper_count: uint?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaItemPrototype" */
     fun help(): String
 }
@@ -3079,27 +3085,27 @@ external interface `T$44` {
 }
 
 external interface LuaItemStack {
-    fun is_blueprint_setup(): Boolean
+    fun is_blueprint_setup(): Boolean?
     fun get_blueprint_entities(): Array<BlueprintEntity>
     fun set_blueprint_entities(entities: Array<BlueprintEntity>)
     fun add_ammo(amount: float)
     fun drain_ammo(amount: float)
     fun add_durability(amount: double)
     fun drain_durability(amount: double)
-    fun can_set_stack(stack: String = definedExternally): Boolean
-    fun can_set_stack(): Boolean
-    fun can_set_stack(stack: ItemStackDefinition = definedExternally): Boolean
-    fun can_set_stack(stack: LuaItemStack = definedExternally): Boolean
-    fun set_stack(stack: String = definedExternally): Boolean
-    fun set_stack(): Boolean
-    fun set_stack(stack: ItemStackDefinition = definedExternally): Boolean
-    fun set_stack(stack: LuaItemStack = definedExternally): Boolean
-    fun transfer_stack(stack: String): Boolean
-    fun transfer_stack(stack: ItemStackDefinition): Boolean
-    fun transfer_stack(stack: LuaItemStack): Boolean
+    fun can_set_stack(stack: String = definedExternally): Boolean?
+    fun can_set_stack(): Boolean?
+    fun can_set_stack(stack: ItemStackDefinition = definedExternally): Boolean?
+    fun can_set_stack(stack: LuaItemStack = definedExternally): Boolean?
+    fun set_stack(stack: String = definedExternally): Boolean?
+    fun set_stack(): Boolean?
+    fun set_stack(stack: ItemStackDefinition = definedExternally): Boolean?
+    fun set_stack(stack: LuaItemStack = definedExternally): Boolean?
+    fun transfer_stack(stack: String): Boolean?
+    fun transfer_stack(stack: ItemStackDefinition): Boolean?
+    fun transfer_stack(stack: LuaItemStack): Boolean?
     fun export_stack(): String
     fun import_stack(data: String): int
-    fun swap_stack(stack: LuaItemStack): Boolean
+    fun swap_stack(stack: LuaItemStack): Boolean?
     fun clear()
     fun get_blueprint_tiles(): Array<Tile>
     fun set_blueprint_tiles(tiles: Array<Tile>)
@@ -3113,16 +3119,16 @@ external interface LuaItemStack {
     fun set_tag(tag_name: String, tag: Number): dynamic /* String | Number | Boolean | table */
     fun set_tag(tag_name: String, tag: Boolean): dynamic /* String | Number | Boolean | table */
     fun set_tag(tag_name: String, tag: table): dynamic /* String | Number | Boolean | table */
-    fun remove_tag(tag: String): Boolean
+    fun remove_tag(tag: String): Boolean?
     fun clear_blueprint()
     fun get_entity_filter(index: uint): String
-    fun set_entity_filter(index: uint, filter: String?): Boolean
-    fun set_entity_filter(index: uint, filter: LuaEntityPrototype?): Boolean
-    fun set_entity_filter(index: uint, filter: LuaEntity?): Boolean
+    fun set_entity_filter(index: uint, filter: String?): Boolean?
+    fun set_entity_filter(index: uint, filter: LuaEntityPrototype?): Boolean?
+    fun set_entity_filter(index: uint, filter: LuaEntity?): Boolean?
     fun get_tile_filter(index: uint): String
-    fun set_tile_filter(index: uint, filter: String?): Boolean
-    fun set_tile_filter(index: uint, filter: LuaTilePrototype?): Boolean
-    fun set_tile_filter(index: uint, filter: LuaTile?): Boolean
+    fun set_tile_filter(index: uint, filter: String?): Boolean?
+    fun set_tile_filter(index: uint, filter: LuaTilePrototype?): Boolean?
+    fun set_tile_filter(index: uint, filter: LuaTile?): Boolean?
     fun clear_deconstruction_item()
     fun clear_upgrade_item()
     fun get_mapper(index: uint, type: String /* "from" | "to" */): UpgradeFilter
@@ -3136,7 +3142,7 @@ external interface LuaItemStack {
     fun set_blueprint_entity_tag(index: uint, tag: String, value: Boolean?)
     fun set_blueprint_entity_tag(index: uint, tag: String, value: table?)
     fun create_grid(): LuaEquipmentGrid
-    var valid_for_read: Boolean
+    var valid_for_read: Boolean?
     var prototype: LuaItemPrototype
     var name: String
     var type: String
@@ -3148,14 +3154,14 @@ external interface LuaItemStack {
     var blueprint_icons: Array<BlueprintSignalIcon>?
     var blueprint_snap_to_grid: Position?
     var blueprint_position_relative_to_grid: Position?
-    var blueprint_absolute_snapping: Boolean
+    var blueprint_absolute_snapping: Boolean?
     var label: String?
     var label_color: dynamic /* ColorTable? | JsTuple<Any, float, Any, float, Any, float, Any, float> */
         get() = definedExternally
         set(value) = definedExternally
-    var allow_manual_label_change: Boolean
+    var allow_manual_label_change: Boolean?
     var cost_to_build: Record<String, uint>
-    var extends_inventory: Boolean
+    var extends_inventory: Boolean?
     var prioritize_insertion_mode: String
     var default_icons: Array<BlueprintItemIcon>
     var tags: Tags
@@ -3167,57 +3173,57 @@ external interface LuaItemStack {
     var entity_filter_mode: entity_filter_mode
     var tile_filter_mode: tile_filter_mode
     var tile_selection_mode: tile_selection_mode
-    var trees_and_rocks_only: Boolean
+    var trees_and_rocks_only: Boolean?
     var entity_filter_count: uint
     var tile_filter_count: uint
     var active_index: uint?
     var item_number: uint?
     var connected_entity: LuaEntity?
-    var is_blueprint: Boolean
-    var is_blueprint_book: Boolean
-    var is_module: Boolean
-    var is_tool: Boolean
-    var is_mining_tool: Boolean
-    var is_armor: Boolean
-    var is_repair_tool: Boolean
-    var is_item_with_label: Boolean
-    var is_item_with_inventory: Boolean
-    var is_item_with_entity_data: Boolean
-    var is_selection_tool: Boolean
-    var is_item_with_tags: Boolean
-    var is_deconstruction_item: Boolean
-    var is_upgrade_item: Boolean
-    var valid: Boolean
+    var is_blueprint: Boolean?
+    var is_blueprint_book: Boolean?
+    var is_module: Boolean?
+    var is_tool: Boolean?
+    var is_mining_tool: Boolean?
+    var is_armor: Boolean?
+    var is_repair_tool: Boolean?
+    var is_item_with_label: Boolean?
+    var is_item_with_inventory: Boolean?
+    var is_item_with_entity_data: Boolean?
+    var is_selection_tool: Boolean?
+    var is_item_with_tags: Boolean?
+    var is_deconstruction_item: Boolean?
+    var is_upgrade_item: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaItemStack" */
     fun help(): String
 }
 
 external interface LuaLampControlBehavior : LuaGenericOnOffControlBehavior {
-    var use_colors: Boolean
+    var use_colors: Boolean?
     var color: ColorTable?
-    override var valid: Boolean
+    override var valid: Boolean?
     override var object_name: String /* "LuaLampControlBehavior" */
     override fun help(): String
 }
 
 external interface LuaLazyLoadedValue<T> {
     fun get(): T
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaLazyLoadedValue" */
     fun help(): String
 }
 
 external interface LuaLogisticCell {
-    fun is_in_logistic_range(position: Position): Boolean
-    fun is_in_construction_range(position: Position): Boolean
-    fun is_neighbour_with(other: LuaLogisticCell): Boolean
+    fun is_in_logistic_range(position: Position): Boolean?
+    fun is_in_construction_range(position: Position): Boolean?
+    fun is_neighbour_with(other: LuaLogisticCell): Boolean?
     var logistic_radius: float
     var logistics_connection_distance: float
     var construction_radius: float
     var stationed_logistic_robot_count: uint
     var stationed_construction_robot_count: uint
-    var mobile: Boolean
-    var transmitting: Boolean
+    var mobile: Boolean?
+    var transmitting: Boolean?
     var charge_approach_distance: float
     var charging_robot_count: uint
     var to_charge_robot_count: uint
@@ -3226,14 +3232,14 @@ external interface LuaLogisticCell {
     var neighbours: Array<LuaLogisticCell>
     var charging_robots: Array<LuaEntity>
     var to_charge_robots: Array<LuaEntity>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaLogisticCell" */
     fun help(): String
 }
 
 external interface LuaLogisticContainerControlBehavior : LuaControlBehavior {
     var circuit_mode_of_operation: _defines_control_behavior_logistic_container_circuit_mode_of_operation
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaLogisticContainerControlBehavior" */
     fun help(): String
 }
@@ -3299,7 +3305,7 @@ external interface LuaLogisticNetwork {
     var robots: Array<LuaEntity>
     var construction_robots: Array<LuaEntity>
     var logistic_robots: Array<LuaEntity>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaLogisticNetwork" */
     fun help(): String
 }
@@ -3313,18 +3319,18 @@ external interface LuaLogisticPoint {
     var force: LuaForce
     var targeted_items_pickup: Record<String, uint>
     var targeted_items_deliver: Record<String, uint>
-    var exact: Boolean
-    var valid: Boolean
+    var exact: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaLogisticPoint" */
     fun help(): String
 }
 
 external interface LuaMiningDrillControlBehavior : LuaGenericOnOffControlBehavior {
-    var circuit_enable_disable: Boolean
-    var circuit_read_resources: Boolean
+    var circuit_enable_disable: Boolean?
+    var circuit_read_resources: Boolean?
     var resource_read_mode: resource_read_mode
     var resource_read_targets: Array<LuaEntity>
-    override var valid: Boolean
+    override var valid: Boolean?
     override var object_name: String /* "LuaMiningDrillControlBehavior" */
     override fun help(): String
 }
@@ -3354,8 +3360,8 @@ external interface LuaModSettingPrototype {
         set(value) = definedExternally
     var allow_blank: Boolean?
     var auto_trim: Boolean?
-    var hidden: Boolean
-    var valid: Boolean
+    var hidden: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaModSettingPrototype" */
     fun help(): String
 }
@@ -3369,7 +3375,7 @@ external interface LuaModuleCategoryPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaModuleCategoryPrototype" */
     fun help(): String
 }
@@ -3385,7 +3391,7 @@ external interface LuaNamedNoiseExpression {
         set(value) = definedExternally
     var intended_property: String
     var expression: NoiseExpression
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaNamedNoiseExpression" */
     fun help(): String
 }
@@ -3399,7 +3405,7 @@ external interface LuaNoiseLayerPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaNoiseLayerPrototype" */
     fun help(): String
 }
@@ -3426,25 +3432,25 @@ external interface LuaParticlePrototype {
     var movement_modifier_when_on_ground: float
     var movement_modifier: float
     var mining_particle_frame_speed: float
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaParticlePrototype" */
     fun help(): String
 }
 
 external interface LuaPermissionGroup {
-    fun add_player(player: uint): Boolean
-    fun add_player(player: String): Boolean
-    fun add_player(player: LuaPlayer): Boolean
-    fun remove_player(player: uint): Boolean
-    fun remove_player(player: String): Boolean
-    fun remove_player(player: LuaPlayer): Boolean
-    fun allows_action(action: input_action): Boolean
-    fun set_allows_action(action: input_action, allow_action: Boolean): Boolean
-    fun destroy(): Boolean
+    fun add_player(player: uint): Boolean?
+    fun add_player(player: String): Boolean?
+    fun add_player(player: LuaPlayer): Boolean?
+    fun remove_player(player: uint): Boolean?
+    fun remove_player(player: String): Boolean?
+    fun remove_player(player: LuaPlayer): Boolean?
+    fun allows_action(action: input_action): Boolean?
+    fun set_allows_action(action: input_action, allow_action: Boolean): Boolean?
+    fun destroy(): Boolean?
     var name: String
     var players: Array<LuaPlayer>
     var group_id: uint
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaPermissionGroup" */
     fun help(): String
 }
@@ -3454,7 +3460,7 @@ external interface LuaPermissionGroups {
     fun get_group(group: String): LuaPermissionGroup?
     fun get_group(group: uint): LuaPermissionGroup?
     var groups: Array<LuaPermissionGroup>
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaPermissionGroups" */
     fun help(): String
 }
@@ -3611,7 +3617,7 @@ external interface LuaPlayer : LuaControl {
     fun set_goal_description(text: Number = definedExternally, only_update: Boolean = definedExternally)
     fun set_goal_description(text: Number = definedExternally)
     fun set_controller(params: `T$47`)
-    fun drag_wire(params: `T$48`): Boolean
+    fun drag_wire(params: `T$48`): Boolean?
     fun disable_recipe_groups()
     fun enable_recipe_groups()
     fun disable_recipe_subgroups()
@@ -3622,25 +3628,25 @@ external interface LuaPlayer : LuaControl {
     fun log_active_entity_chunk_counts()
     fun log_active_entity_counts()
     fun unlock_achievement(name: String)
-    fun clear_cursor(): Boolean
-    fun create_character(character: String = definedExternally): Boolean
+    fun clear_cursor(): Boolean?
+    fun create_character(character: String = definedExternally): Boolean?
     fun add_alert(entity: LuaEntity, type: alert_type)
     fun add_custom_alert(entity: LuaEntity, icon: SignalID, message: Any /* JsTuple<String, Any> */, show_on_map: Boolean)
     fun add_custom_alert(entity: LuaEntity, icon: SignalID, message: String, show_on_map: Boolean)
     fun add_custom_alert(entity: LuaEntity, icon: SignalID, message: Number, show_on_map: Boolean)
     fun remove_alert(params: `T$49`)
     fun get_alerts(params: `T$50`): Record<uint, Record<alert_type, Array<Alert>>>
-    fun mute_alert(alert_type: alert_type): Boolean
-    fun unmute_alert(alert_type: alert_type): Boolean
-    fun is_alert_muted(alert_type: alert_type): Boolean
-    fun enable_alert(alert_type: alert_type): Boolean
-    fun disable_alert(alert_type: alert_type): Boolean
-    fun is_alert_enabled(alert_type: alert_type): Boolean
-    fun pipette_entity(entity: String): Boolean
-    fun pipette_entity(entity: LuaEntity): Boolean
-    fun pipette_entity(entity: LuaEntityPrototype): Boolean
-    fun can_place_entity(params: `T$51`): Boolean
-    fun can_build_from_cursor(params: `T$52`): Boolean
+    fun mute_alert(alert_type: alert_type): Boolean?
+    fun unmute_alert(alert_type: alert_type): Boolean?
+    fun is_alert_muted(alert_type: alert_type): Boolean?
+    fun enable_alert(alert_type: alert_type): Boolean?
+    fun disable_alert(alert_type: alert_type): Boolean?
+    fun is_alert_enabled(alert_type: alert_type): Boolean?
+    fun pipette_entity(entity: String): Boolean?
+    fun pipette_entity(entity: LuaEntity): Boolean?
+    fun pipette_entity(entity: LuaEntityPrototype): Boolean?
+    fun can_place_entity(params: `T$51`): Boolean?
+    fun can_build_from_cursor(params: `T$52`): Boolean?
     fun build_from_cursor(params: `T$52`)
     fun use_from_cursor(position: Position)
     fun play_sound(params: `T$34`)
@@ -3659,15 +3665,15 @@ external interface LuaPlayer : LuaControl {
     fun open_map(position: Position, scale: double = definedExternally)
     fun zoom_to_world(position: Position, scale: double = definedExternally)
     fun close_map()
-    fun is_shortcut_toggled(prototype_name: String): Boolean
-    fun is_shortcut_available(prototype_name: String): Boolean
+    fun is_shortcut_toggled(prototype_name: String): Boolean?
+    fun is_shortcut_available(prototype_name: String): Boolean?
     fun set_shortcut_toggled(prototype_name: String, toggled: Boolean)
     fun set_shortcut_available(prototype_name: String, available: Boolean)
     fun connect_to_server(params: `T$54`)
     fun toggle_map_editor()
-    fun request_translation(localised_string: Any /* JsTuple<String, Any> */): Boolean
-    fun request_translation(localised_string: String): Boolean
-    fun request_translation(localised_string: Number): Boolean
+    fun request_translation(localised_string: Any /* JsTuple<String, Any> */): Boolean?
+    fun request_translation(localised_string: String): Boolean?
+    fun request_translation(localised_string: Number): Boolean?
     fun get_infinity_inventory_filter(index: uint): InfinityInventoryFilter?
     fun set_infinity_inventory_filter(index: uint, filter: InfinityInventoryFilter?)
     fun clear_recipe_notifications()
@@ -3680,11 +3686,11 @@ external interface LuaPlayer : LuaControl {
     var cutscene_character: LuaEntity?
     var index: uint
     var gui: LuaGui
-    var opened_self: Boolean
+    var opened_self: Boolean?
     var controller_type: controllers
     var stashed_controller_type: controllers?
     var game_view_settings: GameViewSettings
-    var minimap_enabled: Boolean
+    var minimap_enabled: Boolean?
     var color: dynamic /* ColorTable | JsTuple<Any, float, Any, float, Any, float, Any, float> */
         get() = definedExternally
         set(value) = definedExternally
@@ -3693,8 +3699,8 @@ external interface LuaPlayer : LuaControl {
         set(value) = definedExternally
     var name: String
     var tag: String
-    var connected: Boolean
-    var admin: Boolean
+    var connected: Boolean?
+    var admin: Boolean?
     var entity_copy_source: LuaEntity?
     var afk_time: uint
     var online_time: uint
@@ -3706,10 +3712,10 @@ external interface LuaPlayer : LuaControl {
     var display_scale: double
     var blueprint_to_setup: LuaItemStack
     var render_mode: render_mode
-    var spectator: Boolean
-    var remove_unfiltered_items: Boolean
+    var spectator: Boolean?
+    var remove_unfiltered_items: Boolean?
     var infinity_inventory_filters: Array<InfinityInventoryFilter>
-    var auto_sort_main_inventory: Boolean
+    var auto_sort_main_inventory: Boolean?
     var hand_location: ItemStackLocation
 }
 
@@ -3719,7 +3725,7 @@ external interface LuaProfiler {
     fun restart()
     fun add(other: LuaProfiler)
     fun divide(number: double)
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaProfiler" */
     fun help(): String
 }
@@ -3727,7 +3733,7 @@ external interface LuaProfiler {
 external interface LuaProgrammableSpeakerControlBehavior : LuaControlBehavior {
     var circuit_parameters: ProgrammableSpeakerCircuitParameters
     var circuit_condition: CircuitConditionDefinition
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaProgrammableSpeakerControlBehavior" */
     fun help(): String
 }
@@ -3744,7 +3750,7 @@ external interface LuaRailChainSignalControlBehavior : LuaControlBehavior {
     var orange_signal: SignalID
     var green_signal: SignalID
     var blue_signal: SignalID
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRailChainSignalControlBehavior" */
     fun help(): String
 }
@@ -3755,7 +3761,7 @@ external interface LuaRailPath {
     var total_distance: double
     var travelled_distance: double
     var rails: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<uint, LuaEntity> */
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRailPath" */
     fun help(): String
 }
@@ -3764,10 +3770,10 @@ external interface LuaRailSignalControlBehavior : LuaControlBehavior {
     var red_signal: SignalID
     var orange_signal: SignalID
     var green_signal: SignalID
-    var close_signal: Boolean
-    var read_signal: Boolean
+    var close_signal: Boolean?
+    var read_signal: Boolean?
     var circuit_condition: CircuitConditionDefinition
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRailSignalControlBehavior" */
     fun help(): String
 }
@@ -3776,7 +3782,7 @@ external interface LuaRandomGenerator {
     fun re_seed(seed: uint)
     @nativeInvoke
     operator fun invoke(lower: int = definedExternally, upper: int = definedExternally): double
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRandomGenerator" */
     fun help(): String
 }
@@ -3791,18 +3797,18 @@ external interface LuaRecipe {
         get() = definedExternally
         set(value) = definedExternally
     var prototype: LuaRecipePrototype
-    var enabled: Boolean
+    var enabled: Boolean?
     var category: String
     var ingredients: Array<dynamic /* FluidIngredient | OtherIngredient */>
     var products: Array<dynamic /* FluidProduct | OtherProduct */>
-    var hidden: Boolean
-    var hidden_from_flow_stats: Boolean
+    var hidden: Boolean?
+    var hidden_from_flow_stats: Boolean?
     var energy: double
     var order: String
     var group: LuaGroup
     var subgroup: LuaGroup
     var force: LuaForce
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRecipe" */
     fun help(): String
 }
@@ -3816,13 +3822,13 @@ external interface LuaRecipeCategoryPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRecipeCategoryPrototype" */
     fun help(): String
 }
 
 external interface LuaRecipePrototype {
-    var enabled: Boolean
+    var enabled: Boolean?
     var name: String
     var localised_name: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
@@ -3836,32 +3842,32 @@ external interface LuaRecipePrototype {
     var main_product: dynamic /* FluidProduct? | OtherProduct? */
         get() = definedExternally
         set(value) = definedExternally
-    var hidden: Boolean
-    var hidden_from_flow_stats: Boolean
-    var hidden_from_player_crafting: Boolean
-    var always_show_made_in: Boolean
+    var hidden: Boolean?
+    var hidden_from_flow_stats: Boolean?
+    var hidden_from_player_crafting: Boolean?
+    var always_show_made_in: Boolean?
     var energy: double
     var order: String
     var group: LuaGroup
     var subgroup: LuaGroup
     var request_paste_multiplier: uint
     var overload_multiplier: uint
-    var allow_inserter_overload: Boolean
-    var allow_as_intermediate: Boolean
-    var allow_intermediates: Boolean
-    var show_amount_in_title: Boolean
-    var always_show_products: Boolean
+    var allow_inserter_overload: Boolean?
+    var allow_as_intermediate: Boolean?
+    var allow_intermediates: Boolean?
+    var show_amount_in_title: Boolean?
+    var always_show_products: Boolean?
     var emissions_multiplier: double
-    var allow_decomposition: Boolean
-    var unlock_results: Boolean
-    var valid: Boolean
+    var allow_decomposition: Boolean?
+    var unlock_results: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaRecipePrototype" */
     fun help(): String
 }
 
 external interface LuaRemote {
     fun add_interface(name: String, functions: Record<String, (args: Any) -> Unit>)
-    fun remove_interface(name: String): Boolean
+    fun remove_interface(name: String): Boolean?
     fun call(_interface: String, _function: String, vararg args: Any): Any
     var interfaces: Record<String, Record<String, Boolean>>
     var object_name: String /* "LuaRemote" */
@@ -3975,7 +3981,7 @@ external interface `T$57` {
     var width: float?
         get() = definedExternally
         set(value) = definedExternally
-    var filled: Boolean
+    var filled: Boolean?
     var target: dynamic /* Position | LuaEntity */
         get() = definedExternally
         set(value) = definedExternally
@@ -4012,7 +4018,7 @@ external interface `T$58` {
     var width: float?
         get() = definedExternally
         set(value) = definedExternally
-    var filled: Boolean
+    var filled: Boolean?
     var left_top: dynamic /* Position | LuaEntity */
         get() = definedExternally
         set(value) = definedExternally
@@ -4299,8 +4305,8 @@ external interface LuaRendering {
     fun draw_light(params: `T$62`): uint64
     fun draw_animation(params: `T$63`): uint64
     fun destroy(id: uint64)
-    fun is_font_valid(font_name: String): Boolean
-    fun is_valid(id: uint64): Boolean
+    fun is_font_valid(font_name: String): Boolean?
+    fun is_valid(id: uint64): Boolean?
     fun get_all_ids(mod_name: String = definedExternally): Array<uint64>
     fun clear(mod_name: String = definedExternally)
     fun get_type(id: uint64): String /* "text" | "line" | "circle" | "rectangle" | "arc" | "polygon" | "sprite" | "light" | "animation" */
@@ -4312,11 +4318,11 @@ external interface LuaRendering {
     fun set_forces(id: uint64, forces: Array<Any /* String | LuaForce */>)
     fun get_players(id: uint64): Array<LuaPlayer>?
     fun set_players(id: uint64, players: Array<Any /* uint | String | LuaPlayer */>)
-    fun get_visible(id: uint64): Boolean
+    fun get_visible(id: uint64): Boolean?
     fun set_visible(id: uint64, visible: Boolean)
-    fun get_draw_on_ground(id: uint64): Boolean
+    fun get_draw_on_ground(id: uint64): Boolean?
     fun set_draw_on_ground(id: uint64, draw_on_ground: Boolean)
-    fun get_only_in_alt_mode(id: uint64): Boolean
+    fun get_only_in_alt_mode(id: uint64): Boolean?
     fun set_only_in_alt_mode(id: uint64, only_in_alt_mode: Boolean)
     fun get_color(id: uint64): ColorTable?
     fun set_color(id: uint64, color: ColorTable)
@@ -4389,14 +4395,14 @@ external interface LuaRendering {
     fun set_vertices(id: uint64, vertices: Array<ScriptRenderVertexTarget>)
     fun get_sprite(id: uint64): dynamic /* String? | ? */
     fun set_sprite(id: uint64, sprite: String)
-    fun set_sprite(id: uint64, sprite: )
+//    fun set_sprite(id: uint64, sprite: )
     fun get_x_scale(id: uint64): double?
     fun set_x_scale(id: uint64, x_scale: double)
     fun get_y_scale(id: uint64): double?
     fun set_y_scale(id: uint64, y_scale: double)
     fun get_render_layer(id: uint64): dynamic /* Number? | ? */
     fun set_render_layer(id: uint64, render_layer: Number)
-    fun set_render_layer(id: uint64, render_layer: )
+    fun set_render_layer(id: uint64, render_layer: String)
     fun get_orientation_target(id: uint64): ScriptRenderTarget?
     fun set_orientation_target(id: uint64, orientation_target: Position, orientation_target_offset: dynamic /* typealias Vector = dynamic */ = definedExternally)
     fun set_orientation_target(id: uint64, orientation_target: Position)
@@ -4428,19 +4434,19 @@ external interface LuaResourceCategoryPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaResourceCategoryPrototype" */
     fun help(): String
 }
 
 external interface LuaRoboportControlBehavior : LuaControlBehavior {
-    var read_logistics: Boolean
-    var read_robot_stats: Boolean
+    var read_logistics: Boolean?
+    var read_robot_stats: Boolean?
     var available_logistic_output_signal: SignalID
     var total_logistic_output_signal: SignalID
     var available_construction_output_signal: SignalID
     var total_construction_output_signal: SignalID
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaRoboportControlBehavior" */
     fun help(): String
 }
@@ -4467,15 +4473,15 @@ external interface LuaShortcutPrototype {
     var action: String
     var item_to_spawn: LuaItemPrototype
     var technology_to_unlock: LuaTechnologyPrototype
-    var toggleable: Boolean
+    var toggleable: Boolean?
     var associated_control_input: String
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaShortcutPrototype" */
     fun help(): String
 }
 
 external interface LuaStorageTankControlBehavior : LuaControlBehavior {
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaStorageTankControlBehavior" */
     fun help(): String
 }
@@ -4507,10 +4513,10 @@ external interface LuaStyle {
     var right_cell_padding: int
     var bottom_cell_padding: int
     var left_cell_padding: int
-    var horizontally_stretchable: Boolean
-    var vertically_stretchable: Boolean
-    var horizontally_squashable: Boolean
-    var vertically_squashable: Boolean
+    var horizontally_stretchable: Boolean?
+    var vertically_stretchable: Boolean?
+    var horizontally_squashable: Boolean?
+    var vertically_squashable: Boolean?
     var rich_text_setting: rich_text_setting
     var hovered_font_color: dynamic /* ColorTable | JsTuple<Any, float, Any, float, Any, float, Any, float> */
         get() = definedExternally
@@ -4539,12 +4545,12 @@ external interface LuaStyle {
         set(value) = definedExternally
     var horizontal_spacing: int
     var vertical_spacing: int
-    var use_header_filler: Boolean
+    var use_header_filler: Boolean?
     var color: dynamic /* ColorTable | JsTuple<Any, float, Any, float, Any, float, Any, float> */
         get() = definedExternally
         set(value) = definedExternally
     var column_alignments: LuaCustomTableMembers /* LuaCustomTableMembers & CustomTableIndex<uint, String /* "top-left" | "middle-left" | "left" | "bottom-left" | "top-center" | "middle-center" | "center" | "bottom-center" | "top-right" | "right" | "bottom-right" */> */
-    var single_line: Boolean
+    var single_line: Boolean?
     var extra_top_padding_when_activated: int
     var extra_bottom_padding_when_activated: int
     var extra_left_padding_when_activated: int
@@ -4553,7 +4559,7 @@ external interface LuaStyle {
     var extra_bottom_margin_when_activated: int
     var extra_left_margin_when_activated: int
     var extra_right_margin_when_activated: int
-    var stretch_image_to_widget_size: Boolean
+    var stretch_image_to_widget_size: Boolean?
     var badge_font: String
     var badge_horizontal_spacing: int
     var default_badge_font_color: dynamic /* ColorTable | JsTuple<Any, float, Any, float, Any, float, Any, float> */
@@ -5239,8 +5245,8 @@ external interface `T$85` {
 
 external interface LuaSurface {
     fun get_pollution(position: Position): double
-    fun can_place_entity(params: `T$64`): Boolean
-    fun can_fast_replace(params: `T$65`): Boolean
+    fun can_place_entity(params: `T$64`): Boolean?
+    fun can_fast_replace(params: `T$65`): Boolean?
     fun find_entity(entity: String, position: Position): LuaEntity?
     fun find_entities(area: BoundingBoxTable = definedExternally): Array<LuaEntity>
     fun find_entities(): Array<LuaEntity>
@@ -5297,8 +5303,8 @@ external interface LuaSurface {
     fun set_tiles(tiles: Array<Tile>, correct_tiles: Boolean = definedExternally, remove_colliding_entities: String = definedExternally, remove_colliding_decoratives: Boolean = definedExternally)
     fun pollute(source: Position, amount: double)
     fun get_chunks(): LuaChunkIterator
-    fun is_chunk_generated(position: ChunkPositionTable): Boolean
-    fun is_chunk_generated(position: Any /* JsTuple<x, int, y, int> */): Boolean
+    fun is_chunk_generated(position: ChunkPositionTable): Boolean?
+    fun is_chunk_generated(position: Any /* JsTuple<x, int, y, int> */): Boolean?
     fun request_to_generate_chunks(position: Position, radius: uint)
     fun force_generate_chunk_requests()
     fun set_chunk_generated_status(position: ChunkPositionTable, status: chunk_generated_status)
@@ -5360,14 +5366,14 @@ external interface LuaSurface {
     fun get_script_area(key: uint = definedExternally): ScriptArea
     fun edit_script_area(id: uint, area: ScriptArea)
     fun add_script_area(area: ScriptArea): uint
-    fun remove_script_area(id: uint): Boolean
+    fun remove_script_area(id: uint): Boolean?
     fun get_script_positions(name: String = definedExternally): Array<ScriptPosition>
     fun get_script_position(key: String = definedExternally): ScriptPosition
     fun get_script_position(): ScriptPosition
     fun get_script_position(key: uint = definedExternally): ScriptPosition
     fun edit_script_position(id: uint, area: ScriptPosition)
     fun add_script_position(area: ScriptPosition): uint
-    fun remove_script_position(id: uint): Boolean
+    fun remove_script_position(id: uint): Boolean?
     fun get_map_exchange_string(): String
     fun get_starting_area_radius(): double
     fun get_closest(position: Position, entities: Array<LuaEntity>): LuaEntity
@@ -5390,15 +5396,15 @@ external interface LuaSurface {
     var name: String
     var index: uint
     var map_gen_settings: MapGenSettings
-    var generate_with_lab_tiles: Boolean
-    var always_day: Boolean
+    var generate_with_lab_tiles: Boolean?
+    var always_day: Boolean?
     var daytime: float
     var darkness: float
     var wind_speed: double
     var wind_orientation: RealOrientation
     var wind_orientation_change: double
-    var peaceful_mode: Boolean
-    var freeze_daytime: Boolean
+    var peaceful_mode: Boolean?
+    var freeze_daytime: Boolean?
     var ticks_per_day: uint
     var dusk: double
     var dawn: double
@@ -5409,8 +5415,8 @@ external interface LuaSurface {
     var brightness_visual_weights: dynamic /* ColorModifierTable | JsTuple<Any, float, Any, float, Any, float, Any, float> */
         get() = definedExternally
         set(value) = definedExternally
-    var show_clouds: Boolean
-    var valid: Boolean
+    var show_clouds: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaSurface" */
     fun help(): String
 }
@@ -5426,10 +5432,10 @@ external interface LuaTechnology {
         get() = definedExternally
         set(value) = definedExternally
     var prototype: LuaTechnologyPrototype
-    var enabled: Boolean
-    var visible_when_disabled: Boolean
-    var upgrade: Boolean
-    var researched: Boolean
+    var enabled: Boolean?
+    var visible_when_disabled: Boolean?
+    var upgrade: Boolean?
+    var researched: Boolean?
     var prerequisites: Record<String, LuaTechnology>
     var research_unit_ingredients: Array<dynamic /* FluidIngredient | OtherIngredient */>
     var effects: Array<dynamic /* GunSpeedTechnologyModifier | AmmoDamageTechnologyModifier | GiveItemTechnologyModifier | TurretAttackTechnologyModifier | UnlockRecipeTechnologyModifier | NothingTechnologyModifier | OtherTechnologyModifier */>
@@ -5438,7 +5444,7 @@ external interface LuaTechnology {
     var order: String
     var level: uint
     var research_unit_count_formula: String?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTechnology" */
     fun help(): String
 }
@@ -5451,11 +5457,11 @@ external interface LuaTechnologyPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var enabled: Boolean
-    var hidden: Boolean
-    var visible_when_disabled: Boolean
-    var ignore_tech_cost_multiplier: Boolean
-    var upgrade: Boolean
+    var enabled: Boolean?
+    var hidden: Boolean?
+    var visible_when_disabled: Boolean?
+    var ignore_tech_cost_multiplier: Boolean?
+    var upgrade: Boolean?
     var prerequisites: Record<String, LuaTechnologyPrototype>
     var research_unit_ingredients: Array<dynamic /* FluidIngredient | OtherIngredient */>
     var effects: Array<dynamic /* GunSpeedTechnologyModifier | AmmoDamageTechnologyModifier | GiveItemTechnologyModifier | TurretAttackTechnologyModifier | UnlockRecipeTechnologyModifier | NothingTechnologyModifier | OtherTechnologyModifier */>
@@ -5465,15 +5471,15 @@ external interface LuaTechnologyPrototype {
     var level: uint
     var max_level: uint
     var research_unit_count_formula: String?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTechnologyPrototype" */
     fun help(): String
 }
 
 external interface LuaTile {
-    fun collides_with(layer: String /* "ground-tile" | "water-tile" | "resource-layer" | "doodad-layer" | "floor-layer" | "item-layer" | "ghost-layer" | "object-layer" | "player-layer" | "train-layer" | "rail-layer" | "transport-belt-layer" | "not-setup" */): Boolean
-    fun collides_with(layer: ): Boolean
-    fun to_be_deconstructed(): Boolean
+    fun collides_with(layer: String /* "ground-tile" | "water-tile" | "resource-layer" | "doodad-layer" | "floor-layer" | "item-layer" | "ghost-layer" | "object-layer" | "player-layer" | "train-layer" | "rail-layer" | "transport-belt-layer" | "not-setup" */): Boolean?
+//    fun collides_with(layer: ): Boolean?
+    fun to_be_deconstructed(): Boolean?
     fun order_deconstruction(force: String, player: uint = definedExternally): LuaEntity?
     fun order_deconstruction(force: String): LuaEntity?
     fun order_deconstruction(force: String, player: String = definedExternally): LuaEntity?
@@ -5495,13 +5501,13 @@ external interface LuaTile {
     var position: PositionTable
     var hidden_tile: String?
     var surface: LuaSurface
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTile" */
     fun help(): String
 }
 
 external interface `T$86` {
-    var minable: Boolean
+    var minable: Boolean?
     var miningtime: double
     var miningparticle: String?
         get() = definedExternally
@@ -5526,15 +5532,15 @@ external interface LuaTilePrototype {
     var vehicle_friction_modifier: float
     var map_color: ColorTable
     var decorative_removal_probability: float
-    var automatic_neighbors: Boolean
+    var automatic_neighbors: Boolean?
     var allowed_neighbors: Record<String, LuaTilePrototype>
-    var needs_correction: Boolean
+    var needs_correction: Boolean?
     var mineable_properties: `T$86`
     var next_direction: LuaTilePrototype?
     var items_to_place_this: Array<dynamic /* String | ItemStackDefinition */>
-    var can_be_part_of_blueprint: Boolean
+    var can_be_part_of_blueprint: Boolean?
     var emissions_per_second: double
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTilePrototype" */
     fun help(): String
 }
@@ -5549,7 +5555,7 @@ external interface LuaTrain {
     fun insert(stack: ItemStackDefinition)
     fun insert(stack: LuaItemStack)
     fun clear_items_inside()
-    fun recalculate_path(force: Boolean = definedExternally): Boolean
+    fun recalculate_path(force: Boolean = definedExternally): Boolean?
     fun get_fluid_count(fluid: String = definedExternally): double
     fun get_fluid_contents(): Record<String, double>
     fun remove_fluid(fluid: Fluid): double
@@ -5557,7 +5563,7 @@ external interface LuaTrain {
     fun clear_fluids_inside()
     fun go_to_station(index: uint)
     fun get_rails(): Array<LuaEntity>
-    var manual_mode: Boolean
+    var manual_mode: Boolean?
     var speed: double
     var max_forward_speed: double
     var max_backward_speed: double
@@ -5575,7 +5581,7 @@ external interface LuaTrain {
     var front_stock: LuaEntity?
     var back_stock: LuaEntity?
     var station: LuaEntity?
-    var has_path: Boolean
+    var has_path: Boolean?
     var path_end_rail: LuaEntity?
     var path_end_stop: LuaEntity?
     var id: uint
@@ -5585,31 +5591,31 @@ external interface LuaTrain {
     var kill_count: uint
     var path: LuaRailPath?
     var signal: LuaEntity?
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTrain" */
     fun help(): String
 }
 
 external interface LuaTrainStopControlBehavior : LuaGenericOnOffControlBehavior {
-    var send_to_train: Boolean
-    var read_from_train: Boolean
-    var read_stopped_train: Boolean
-    var set_trains_limit: Boolean
-    var read_trains_count: Boolean
-    var enable_disable: Boolean
+    var send_to_train: Boolean?
+    var read_from_train: Boolean?
+    var read_stopped_train: Boolean?
+    var set_trains_limit: Boolean?
+    var read_trains_count: Boolean?
+    var enable_disable: Boolean?
     var stopped_train_signal: SignalID
     var trains_count_signal: SignalID
     var trains_limit_signal: SignalID
-    override var valid: Boolean
+    override var valid: Boolean?
     override var object_name: String /* "LuaTrainStopControlBehavior" */
     override fun help(): String
 }
 
 external interface LuaTransportBeltControlBehavior : LuaGenericOnOffControlBehavior {
-    var enable_disable: Boolean
-    var read_contents: Boolean
+    var enable_disable: Boolean?
+    var read_contents: Boolean?
     var read_contents_mode: content_read_mode
-    override var valid: Boolean
+    override var valid: Boolean?
     override var object_name: String /* "LuaTransportBeltControlBehavior" */
     override fun help(): String
 }
@@ -5634,14 +5640,14 @@ external interface LuaTrivialSmokePrototype {
     var fade_away_duration: uint
     var fade_in_duration: uint
     var glow_fade_away_duration: uint
-    var cyclic: Boolean
-    var affected_by_wind: Boolean
-    var show_when_smoke_off: Boolean
-    var glow_animation: Boolean
+    var cyclic: Boolean?
+    var affected_by_wind: Boolean?
+    var show_when_smoke_off: Boolean?
+    var glow_animation: Boolean?
     var render_layer: dynamic /* Number |  */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaTrivialSmokePrototype" */
     fun help(): String
 }
@@ -5675,14 +5681,14 @@ external interface LuaUnitGroup {
     var force: LuaForce
     var surface: LuaSurface
     var group_number: uint
-    var is_script_driven: Boolean
+    var is_script_driven: Boolean?
     var command: dynamic /* AttackCommand? | GoToLocationCommand? | CompoundCommand? | GroupCommand? | AttackAreaCommand? | WanderCommand? | StopCommand? | FleeCommand? | BuildBaseCommand? */
         get() = definedExternally
         set(value) = definedExternally
     var distraction_command: dynamic /* AttackCommand? | GoToLocationCommand? | CompoundCommand? | GroupCommand? | AttackAreaCommand? | WanderCommand? | StopCommand? | FleeCommand? | BuildBaseCommand? */
         get() = definedExternally
         set(value) = definedExternally
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaUnitGroup" */
     fun help(): String
 }
@@ -5696,28 +5702,28 @@ external interface LuaVirtualSignalPrototype {
     var localised_description: dynamic /* JsTuple<String, Any> | String | Number */
         get() = definedExternally
         set(value) = definedExternally
-    var special: Boolean
+    var special: Boolean?
     var subgroup: LuaGroup
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaVirtualSignalPrototype" */
     fun help(): String
 }
 
 external interface LuaVoidEnergySourcePrototype {
     var emissions: double
-    var render_no_network_icon: Boolean
-    var render_no_power_icon: Boolean
-    var valid: Boolean
+    var render_no_network_icon: Boolean?
+    var render_no_power_icon: Boolean?
+    var valid: Boolean?
     var object_name: String /* "LuaVoidEnergySourcePrototype" */
     fun help(): String
 }
 
 external interface LuaWallControlBehavior : LuaControlBehavior {
     var circuit_condition: CircuitConditionDefinition
-    var open_gate: Boolean
-    var read_sensor: Boolean
+    var open_gate: Boolean?
+    var read_sensor: Boolean?
     var output_signal: SignalID
-    var valid: Boolean
+    var valid: Boolean?
     var object_name: String /* "LuaWallControlBehavior" */
     fun help(): String
 }
\ No newline at end of file
diff --git a/modules/mod2/dukat-custom/coroutine.coroutine.module_lua-types.kt b/modules/mod2/dukat-custom/coroutine/coroutine.coroutine.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/coroutine.coroutine.module_lua-types.kt
rename to modules/mod2/dukat-custom/coroutine/coroutine.coroutine.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/debug.debug.module_lua-types.kt b/modules/mod2/dukat-custom/debug/debug.debug.module_lua-types.kt
similarity index 99%
rename from modules/mod2/dukat-custom/debug.debug.module_lua-types.kt
rename to modules/mod2/dukat-custom/debug/debug.debug.module_lua-types.kt
index 7068d82..fd5215e 100644
--- a/modules/mod2/dukat-custom/debug.debug.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/debug/debug.debug.module_lua-types.kt
@@ -27,8 +27,8 @@ external fun gethook(thread: LuaThread = definedExternally): dynamic /* JsTuple<
 
 external interface FunctionInfo<T : Function<*>> {
     var nparams: Number
-    var isvararg: Boolean
-    var istailcall: Boolean
+    var isvararg: Boolean?
+    var istailcall: Boolean?
     var func: T
     var name: String?
         get() = definedExternally
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/defines.defines.control_behavior.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/defines.defines.control_behavior.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.inserter.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/inserter/defines.defines.control_behavior.inserter.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.inserter.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/inserter/defines.defines.control_behavior.inserter.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.lamp.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/lamp/defines.defines.control_behavior.lamp.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.lamp.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/lamp/defines.defines.control_behavior.lamp.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.logistic_container.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/logistic_container/defines.defines.control_behavior.logistic_container.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.logistic_container.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/logistic_container/defines.defines.control_behavior.logistic_container.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.mining_drill.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/mining_drill/defines.defines.control_behavior.mining_drill.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.mining_drill.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/mining_drill/defines.defines.control_behavior.mining_drill.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.control_behavior.transport_belt.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/control_behavior/transport_belt/defines.defines.control_behavior.transport_belt.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.control_behavior.transport_belt.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/control_behavior/transport_belt/defines.defines.control_behavior.transport_belt.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.deconstruction_item.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/deconstruction_item/defines.defines.deconstruction_item.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.deconstruction_item.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/deconstruction_item/defines.defines.deconstruction_item.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/defines.defines.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/defines.defines.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.difficulty_settings.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/difficulty_settings/defines.defines.difficulty_settings.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.difficulty_settings.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/difficulty_settings/defines.defines.difficulty_settings.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.events.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/events/defines.defines.events.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.events.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/events/defines.defines.events.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/defines.defines.riding.module_typed-factorio.kt b/modules/mod2/dukat-custom/defines/riding/defines.defines.riding.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/defines.defines.riding.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/defines/riding/defines.defines.riding.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/events.module_typed-factorio.kt b/modules/mod2/dukat-custom/events.module_typed-factorio.kt
index 11d3550..497a8ff 100644
--- a/modules/mod2/dukat-custom/events.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/events.module_typed-factorio.kt
@@ -37,7 +37,7 @@ external interface CustomInputEvent {
 external interface OnAiCommandCompletedEvent {
     var unit_number: uint
     var result: behavior_result
-    var was_distracted: Boolean
+    var was_distracted: Boolean?
     var name: Any
     var tick: uint
 }
@@ -54,11 +54,11 @@ external interface OnAreaClonedEvent {
     var destination_force: LuaForce?
         get() = definedExternally
         set(value) = definedExternally
-    var clone_tiles: Boolean
-    var clone_entities: Boolean
-    var clone_decoratives: Boolean
-    var clear_destination_entities: Boolean
-    var clear_destination_decoratives: Boolean
+    var clone_tiles: Boolean?
+    var clone_entities: Boolean?
+    var clone_decoratives: Boolean?
+    var clear_destination_entities: Boolean?
+    var clear_destination_decoratives: Boolean?
     var name: Any
     var tick: uint
 }
@@ -82,11 +82,11 @@ external interface OnBrushClonedEvent {
     var destination_force: LuaForce?
         get() = definedExternally
         set(value) = definedExternally
-    var clone_tiles: Boolean
-    var clone_entities: Boolean
-    var clone_decoratives: Boolean
-    var clear_destination_entities: Boolean
-    var clear_destination_decoratives: Boolean
+    var clone_tiles: Boolean?
+    var clone_entities: Boolean?
+    var clone_decoratives: Boolean?
+    var clear_destination_entities: Boolean?
+    var clear_destination_decoratives: Boolean?
     var name: Any
     var tick: uint
 }
@@ -319,7 +319,7 @@ external interface OnEntityRenamedEvent {
     var player_index: uint?
         get() = definedExternally
         set(value) = definedExternally
-    var by_script: Boolean
+    var by_script: Boolean?
     var entity: LuaEntity
     var old_name: String
     var name: Any
@@ -359,7 +359,7 @@ external interface OnEquipmentRemovedEvent {
 external interface OnForceCeaseFireChangedEvent {
     var force: LuaForce
     var other_force: LuaForce
-    var added: Boolean
+    var added: Boolean?
     var name: Any
     var tick: uint
 }
@@ -373,7 +373,7 @@ external interface OnForceCreatedEvent {
 external interface OnForceFriendsChangedEvent {
     var force: LuaForce
     var other_force: LuaForce
-    var added: Boolean
+    var added: Boolean?
     var name: Any
     var tick: uint
 }
@@ -419,9 +419,9 @@ external interface OnGuiClickEvent {
         set(value) = definedExternally
     var player_index: uint
     var button: mouse_button_type
-    var alt: Boolean
-    var control: Boolean
-    var shift: Boolean
+    var alt: Boolean?
+    var control: Boolean?
+    var shift: Boolean?
     var name: Any
     var tick: uint
 }
@@ -459,9 +459,9 @@ external interface OnGuiConfirmedEvent {
         get() = definedExternally
         set(value) = definedExternally
     var player_index: uint
-    var alt: Boolean
-    var control: Boolean
-    var shift: Boolean
+    var alt: Boolean?
+    var control: Boolean?
+    var shift: Boolean?
     var name: Any
     var tick: uint
 }
@@ -789,7 +789,7 @@ external interface OnPlayerDeconstructedAreaEvent {
         get() = definedExternally
         set(value) = definedExternally
     var item: String
-    var alt: Boolean
+    var alt: Boolean?
     var name: Any
     var tick: uint
 }
@@ -842,7 +842,7 @@ external interface OnPlayerDroppedItemEvent {
 external interface OnPlayerFastTransferredEvent {
     var player_index: uint
     var entity: LuaEntity
-    var from_player: Boolean
+    var from_player: Boolean?
     var name: Any
     var tick: uint
 }
@@ -852,7 +852,7 @@ external interface OnPlayerFlushedFluidEvent {
     var fluid: String
     var amount: double
     var entity: LuaEntity
-    var only_this_entity: Boolean
+    var only_this_entity: Boolean?
     var name: Any
     var tick: uint
 }
@@ -928,7 +928,7 @@ external interface OnPlayerMutedEvent {
 external interface OnPlayerPipetteEvent {
     var player_index: uint
     var item: LuaItemPrototype
-    var used_cheat_mode: Boolean
+    var used_cheat_mode: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1012,7 +1012,7 @@ external interface OnPlayerSetupBlueprintEvent {
         get() = definedExternally
         set(value) = definedExternally
     var item: String
-    var alt: Boolean
+    var alt: Boolean?
     var mapping: LuaLazyLoadedValue<Record<uint, LuaEntity>>
     var name: Any
     var tick: uint
@@ -1020,7 +1020,7 @@ external interface OnPlayerSetupBlueprintEvent {
 
 external interface OnPlayerToggledAltModeEvent {
     var player_index: uint
-    var alt_mode: Boolean
+    var alt_mode: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1070,7 +1070,7 @@ external interface OnPlayerUsedSpiderRemoteEvent {
     var player_index: uint
     var vehicle: LuaEntity
     var position: Position
-    var success: Boolean
+    var success: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1099,11 +1099,11 @@ external interface OnPostEntityDiedEvent {
 external interface OnPreBuildEvent {
     var player_index: uint
     var position: Position
-    var shift_build: Boolean
+    var shift_build: Boolean?
     var direction: direction
-    var flip_horizontal: Boolean
-    var flip_vertical: Boolean
-    var created_by_moving: Boolean
+    var flip_horizontal: Boolean?
+    var flip_vertical: Boolean?
+    var created_by_moving: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1223,14 +1223,14 @@ external interface OnPreSurfaceDeletedEvent {
 
 external interface OnResearchFinishedEvent {
     var research: LuaTechnology
-    var by_script: Boolean
+    var by_script: Boolean?
     var name: Any
     var tick: uint
 }
 
 external interface OnResearchReversedEvent {
     var research: LuaTechnology
-    var by_script: Boolean
+    var by_script: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1361,7 +1361,7 @@ external interface OnScriptPathRequestFinishedEvent {
         get() = definedExternally
         set(value) = definedExternally
     var id: uint
-    var try_again_later: Boolean
+    var try_again_later: Boolean?
     var name: Any
     var tick: uint
 }
@@ -1418,7 +1418,7 @@ external interface OnStringTranslatedEvent {
         get() = definedExternally
         set(value) = definedExternally
     var result: String
-    var translated: Boolean
+    var translated: Boolean?
     var name: Any
     var tick: uint
 }
diff --git a/modules/mod2/dukat-custom/global.module_lua-types.kt b/modules/mod2/dukat-custom/global.module_lua-types.kt
index e25a73e..1a0a17e 100644
--- a/modules/mod2/dukat-custom/global.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/global.module_lua-types.kt
@@ -48,7 +48,7 @@ external fun <T> ipairs(t: Record<Number, T>): Iterable<dynamic /* JsTuple<Numbe
 
 external fun next(table: Any?, index: Any = definedExternally): dynamic /* JsTuple<Any, Any> | JsTuple<> */
 
-external fun <TKey, TValue> pairs(t: LuaTable<TKey, TValue>): Iterable<dynamic /* JsTuple<TKey, NonNullable<TValue>> */> /* Iterable<dynamic /* JsTuple<TKey, NonNullable<TValue>> */> & LuaIterator<dynamic /* JsTuple<TKey, NonNullable<TValue>> */, undefined> & LuaExtension<String /* "__luaIterableBrand" */> */
+external fun <TKey : AnyNotNil, TValue> pairs(t: LuaTable<TKey, TValue>): Iterable<dynamic /* JsTuple<TKey, NonNullable<TValue>> */> /* Iterable<dynamic /* JsTuple<TKey, NonNullable<TValue>> */> & LuaIterator<dynamic /* JsTuple<TKey, NonNullable<TValue>> */, undefined> & LuaExtension<String /* "__luaIterableBrand" */> */
 
 external fun <T> pairs(t: T): Iterable<dynamic /* JsTuple<Any, NonNullable<Any>> */> /* Iterable<dynamic /* JsTuple<Any, NonNullable<Any>> */> & LuaIterator<dynamic /* JsTuple<Any, NonNullable<Any>> */, undefined> & LuaExtension<String /* "__luaIterableBrand" */> */
 
diff --git a/modules/mod2/dukat-custom/index.module_typescript-to-lua.kt b/modules/mod2/dukat-custom/index.module_typescript-to-lua.kt
index 25e92fc..cb772bd 100644
--- a/modules/mod2/dukat-custom/index.module_typescript-to-lua.kt
+++ b/modules/mod2/dukat-custom/index.module_typescript-to-lua.kt
@@ -22,7 +22,8 @@ external interface AnyNotNil
 
 typealias LuaExtension<TBrand> = Any
 
-external var `$multi`: (values: T) -> T /* (values: T) -> T & LuaExtension<String /* "__luaMultiFunctionBrand" */> */
+//external var `$multi`: (values: T) -> T /* (values: T) -> T & LuaExtension<String /* "__luaMultiFunctionBrand" */> */
+external fun <T> `$multi`(values: T): T /* (values: T) -> T & LuaExtension<String /* "__luaMultiFunctionBrand" */> */
 
 external var `$range`: (start: Number, limit: Number, step: Number) -> Iterable<Number> /* (start: Number, limit: Number, step: Number) -> Iterable<Number> & LuaExtension<String /* "__luaRangeFunctionBrand" */> */
 
@@ -38,5 +39,5 @@ external interface LuaTable<TKey : AnyNotNil, TValue> {
     var has: (key: TKey) -> Boolean /* (key: TKey) -> Boolean & LuaExtension<String /* "__luaTableHasMethodBrand" */> */
     var delete: (key: TKey) -> Boolean /* (key: TKey) -> Boolean & LuaExtension<String /* "__luaTableDeleteMethodBrand" */> */
 
-    companion object : Any by definedExternally
+//    companion object : Any by definedExternally
 }
\ No newline at end of file
diff --git a/modules/mod2/dukat-custom/io.module_lua-types.kt b/modules/mod2/dukat-custom/io.module_lua-types.kt
index abe679d..af58374 100644
--- a/modules/mod2/dukat-custom/io.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/io.module_lua-types.kt
@@ -21,7 +21,7 @@ external interface LuaFile {
     fun flush(): Boolean
     fun <T : Array<dynamic /* "*n" | "*l" | "*a" | "*L" | Number */>> lines(vararg formats: T): Iterable<Any /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */> /* Iterable<Any /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */> & LuaIterator<Any /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */, undefined> & LuaExtension<String /* "__luaIterableBrand" */> */
     fun read(): FileReadFormatToType<String /* "*l" */>?
-    fun <T> read(format: T): FileReadFormatToType? /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */
+    fun <T> read(format: T): FileReadFormatToType<T>? /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */
     fun seek(whence: String /* "set" | "cur" | "end" */ = definedExternally, offset: Number = definedExternally): dynamic /* JsTuple<Number> | JsTuple<Nothing?, String> */
     fun setvbuf(mode: String /* "no" | "full" | "line" */, size: Number = definedExternally)
     fun write(vararg args: Any /* String | Number */): dynamic /* JsTuple<LuaFile> | JsTuple<Nothing?, String> */
diff --git a/modules/mod2/dukat-custom/io.io.module_lua-types.kt b/modules/mod2/dukat-custom/io/io.io.module_lua-types.kt
similarity index 94%
rename from modules/mod2/dukat-custom/io.io.module_lua-types.kt
rename to modules/mod2/dukat-custom/io/io.io.module_lua-types.kt
index 80cd0cd..87ba8d5 100644
--- a/modules/mod2/dukat-custom/io.io.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/io/io.io.module_lua-types.kt
@@ -42,7 +42,7 @@ external fun popen(prog: String, mode: String /* "r" | "w" */ = definedExternall
 
 external fun read(): FileReadFormatToType<String /* "*l" */>?
 
-external fun <T> read(format: T): FileReadFormatToType? /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */
+external fun <T> read(format: T): FileReadFormatToType<T>? /* Any & LuaExtension<String /* "__luaMultiReturnBrand" */> */
 
 external var stderr: LuaFile
 
diff --git a/modules/mod2/dukat-custom/nonDeclarations.io.kt b/modules/mod2/dukat-custom/io/nonDeclarations.io.kt
similarity index 100%
rename from modules/mod2/dukat-custom/nonDeclarations.io.kt
rename to modules/mod2/dukat-custom/io/nonDeclarations.io.kt
diff --git a/modules/mod2/dukat-custom/librariesAndFunctions.module_typed-factorio.kt b/modules/mod2/dukat-custom/librariesAndFunctions.module_typed-factorio.kt
index 547ceff..dec76ff 100644
--- a/modules/mod2/dukat-custom/librariesAndFunctions.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/librariesAndFunctions.module_typed-factorio.kt
@@ -30,15 +30,15 @@ external interface SerpentOptions {
     var sortkeys: dynamic /* Boolean | (this: Unit, keys: Array<Any>, table: Any) -> Unit */
         get() = definedExternally
         set(value) = definedExternally
-    var sparse: Boolean
-    var compact: Boolean
-    var fatal: Boolean
-    var nocode: Boolean
-    var nohuge: Boolean
+    var sparse: Boolean?
+    var compact: Boolean?
+    var fatal: Boolean?
+    var nocode: Boolean?
+    var nohuge: Boolean?
     var maxlevel: Number
     var maxnum: Number
     var maxlength: Number
-    var metatostring: Boolean
+    var metatostring: Boolean?
     var numformat: String
     var valignore: Array<String>
     var keyallow: Array<String>
diff --git a/modules/mod2/dukat-custom/math.math.module_lua-types.kt b/modules/mod2/dukat-custom/math/math.math.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/math.math.module_lua-types.kt
rename to modules/mod2/dukat-custom/math/math.math.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/metatable.module_lua-types.kt b/modules/mod2/dukat-custom/metatable.module_lua-types.kt
index c538a64..654ca6c 100644
--- a/modules/mod2/dukat-custom/metatable.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/metatable.module_lua-types.kt
@@ -15,8 +15,10 @@ import org.w3c.workers.*
 import org.w3c.xhr.*
 
 external interface LuaMetatable<T, TIndex> {
-    val <T> __pairs: ((t: T) -> dynamic)?
-    val <T : Any?> __ipairs: ((t: T) -> dynamic)?
+//    val <T> __pairs: ((t: T) -> dynamic)?
+//    val <T : Any?> __ipairs: ((t: T) -> dynamic)?
+    fun <T> __pairs(t: T): dynamic
+    fun <T : Any?> __ipairs(t: T): dynamic
     val __add: ((operand: Any) -> Any)?
     val __sub: ((operand: Any) -> Any)?
     val __mul: ((operand: Any) -> Any)?
diff --git a/modules/mod2/dukat-custom/mod-gui.mod_gui.module_typed-factorio.kt b/modules/mod2/dukat-custom/mod_gui/mod-gui.mod_gui.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/mod-gui.mod_gui.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/mod_gui/mod-gui.mod_gui.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/os.module_lua-types.kt b/modules/mod2/dukat-custom/os.module_lua-types.kt
index a6818b4..8f6fe7b 100644
--- a/modules/mod2/dukat-custom/os.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/os.module_lua-types.kt
@@ -39,7 +39,7 @@ external interface LuaDateInfoResult {
     var hour: Number
     var min: Number
     var sec: Number
-    var isdst: Boolean
+    var isdst: Boolean?
     var yday: Number
     var wday: Number
 }
\ No newline at end of file
diff --git a/modules/mod2/dukat-custom/os.os.module_lua-types.kt b/modules/mod2/dukat-custom/os/os.os.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/os.os.module_lua-types.kt
rename to modules/mod2/dukat-custom/os/os.os.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/modules.package.module_lua-types.kt b/modules/mod2/dukat-custom/package/modules.package.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/modules.package.module_lua-types.kt
rename to modules/mod2/dukat-custom/package/modules.package.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/librariesAndFunctions.serpent.module_typed-factorio.kt b/modules/mod2/dukat-custom/serpent/librariesAndFunctions.serpent.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/librariesAndFunctions.serpent.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/serpent/librariesAndFunctions.serpent.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/string.string.module_lua-types.kt b/modules/mod2/dukat-custom/string/string.string.module_lua-types.kt
similarity index 100%
rename from modules/mod2/dukat-custom/string.string.module_lua-types.kt
rename to modules/mod2/dukat-custom/string/string.string.module_lua-types.kt
diff --git a/modules/mod2/dukat-custom/table.table.module_lua-types.kt b/modules/mod2/dukat-custom/table/table.table.module_lua-types.kt
similarity index 98%
rename from modules/mod2/dukat-custom/table.table.module_lua-types.kt
rename to modules/mod2/dukat-custom/table/table.table.module_lua-types.kt
index 63cd957..f39ea86 100644
--- a/modules/mod2/dukat-custom/table.table.module_lua-types.kt
+++ b/modules/mod2/dukat-custom/table/table.table.module_lua-types.kt
@@ -1,6 +1,6 @@
 @file:JsQualifier("table")
 @file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS")
-package table
+package table2
 
 import kotlin.js.*
 import org.khronos.webgl.*
diff --git a/modules/mod2/dukat-custom/lib.dom.kt b/modules/mod2/dukat-custom/tsstdlib/lib.dom.kt
similarity index 100%
rename from modules/mod2/dukat-custom/lib.dom.kt
rename to modules/mod2/dukat-custom/tsstdlib/lib.dom.kt
diff --git a/modules/mod2/dukat-custom/lib.es2015.iterable.kt b/modules/mod2/dukat-custom/tsstdlib/lib.es2015.iterable.kt
similarity index 98%
rename from modules/mod2/dukat-custom/lib.es2015.iterable.kt
rename to modules/mod2/dukat-custom/tsstdlib/lib.es2015.iterable.kt
index fd548b7..41ccc71 100644
--- a/modules/mod2/dukat-custom/lib.es2015.iterable.kt
+++ b/modules/mod2/dukat-custom/tsstdlib/lib.es2015.iterable.kt
@@ -23,7 +23,7 @@ external interface IteratorYieldResult<TYield> {
 }
 
 external interface IteratorReturnResult<TReturn> {
-    var done: Boolean
+    var done: Boolean?
     var value: TReturn
 }
 
diff --git a/modules/mod2/dukat-custom/lib.es5.kt b/modules/mod2/dukat-custom/tsstdlib/lib.es5.kt
similarity index 100%
rename from modules/mod2/dukat-custom/lib.es5.kt
rename to modules/mod2/dukat-custom/tsstdlib/lib.es5.kt
diff --git a/modules/mod2/dukat-custom/types.module_typed-factorio.kt b/modules/mod2/dukat-custom/types.module_typed-factorio.kt
index 11d34eb..3b00bbe 100644
--- a/modules/mod2/dukat-custom/types.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/types.module_typed-factorio.kt
@@ -35,7 +35,7 @@ external interface BaseSettingDefinition {
 
 external interface BoolSettingDefinition : BaseSettingDefinition {
     override var type: String /* "bool-setting" */
-    var default_value: Boolean
+    var default_value: Boolean?
     var forced_value: Boolean?
         get() = definedExternally
         set(value) = definedExternally
diff --git a/modules/mod2/dukat-custom/util.util.table.module_typed-factorio.kt b/modules/mod2/dukat-custom/util/table/util.util.table.module_typed-factorio.kt
similarity index 100%
rename from modules/mod2/dukat-custom/util.util.table.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/util/table/util.util.table.module_typed-factorio.kt
diff --git a/modules/mod2/dukat-custom/util.util.module_typed-factorio.kt b/modules/mod2/dukat-custom/util/util.util.module_typed-factorio.kt
similarity index 84%
rename from modules/mod2/dukat-custom/util.util.module_typed-factorio.kt
rename to modules/mod2/dukat-custom/util/util.util.module_typed-factorio.kt
index 843ae01..ed78e1c 100644
--- a/modules/mod2/dukat-custom/util.util.module_typed-factorio.kt
+++ b/modules/mod2/dukat-custom/util/util.util.module_typed-factorio.kt
@@ -3,6 +3,7 @@
 @file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS")
 package util
 
+import AnyNotNil
 import kotlin.js.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
@@ -49,15 +50,13 @@ external fun multiply_color(c1: ColorTable, n: Number): dynamic /* JsTuple<Any,
 
 external fun multiply_color(c1: Any /* JsTuple<Any, float, Any, float, Any, float, Any, float> */, n: Number): dynamic /* JsTuple<Any, float, Any, float, Any, float, Any, float> */
 
-external fun moveposition(position: Position, direction: defines.direction.north, distance: Number): Position
+external fun moveposition(position: Position, direction: defines.direction, distance: Number): Position?
+//external fun moveposition(position: Position, direction: defines.direction.north, distance: Number): Position
+//external fun moveposition(position: Position, direction: defines.direction.east, distance: Number): Position
+//external fun moveposition(position: Position, direction: defines.direction.south, distance: Number): Position
+//external fun moveposition(position: Position, direction: defines.direction.west, distance: Number): Position
 
-external fun moveposition(position: Position, direction: defines.direction.east, distance: Number): Position
-
-external fun moveposition(position: Position, direction: defines.direction.south, distance: Number): Position
-
-external fun moveposition(position: Position, direction: defines.direction.west, distance: Number): Position
-
-external fun moveposition(position: Position, direction: direction, distance: Number): Position?
+//external fun moveposition(position: Position, direction: direction, distance: Number): Position?
 
 external fun oppositedirection(direction: direction): direction
 
@@ -108,4 +107,4 @@ external fun <T> remove_from_list(list: Array<T>, value: T): Boolean
 
 external fun <T : Any> list_to_map(list: Array<T>): dynamic /* Record | LuaTable */
 
-external fun <T> list_to_map(list: T): LuaTable<Any, Boolean>
\ No newline at end of file
+external fun <T> list_to_map(list: T): LuaTable<AnyNotNil, Boolean>
\ No newline at end of file