diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index b9936857..506ee055 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -1,360 +1,397 @@
-local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
+local FUN = require('__pycoalprocessing__/prototypes/functions/functions')
 
 if mods.pyalternativeenergy then -- used in turd upgrade zipir path 3
-  local recipe = table.deepcopy(data.raw.recipe['zipir1-pyvoid'])
-  recipe.name = 'zipir1-pyvoid-hatchery'
-  recipe.icons = nil
-  recipe.icon = '__pyhightechgraphics__/graphics/icons/rendering.png'
-  recipe.icon_size = 32
-  recipe.results = {{type = 'item', name = 'processed-ash', probability = 0.8, amount = 1}}
-  data:extend{recipe}
+	local recipe = table.deepcopy(data.raw.recipe['zipir1-pyvoid'])
+	recipe.name = 'zipir1-pyvoid-hatchery'
+	recipe.icons = nil
+	recipe.icon = '__pyhightechgraphics__/graphics/icons/rendering.png'
+	recipe.icon_size = 32
+	recipe.results = {{type = 'item', name = 'processed-ash', probability = 0.8, amount = 1}}
+	data:extend {recipe}
 end
 
 --ADAPTATIONS
 
 for _, drill in pairs(data.raw['mining-drill']) do
-  if drill.module_specification then
-	  drill.allowed_effects = {"consumption", "speed", "productivity"}
-  else
-    drill.allowed_effects = {"consumption", "productivity"}
-  end
+	if drill.module_specification then
+		drill.allowed_effects = {'consumption', 'speed', 'productivity'}
+	else
+		drill.allowed_effects = {'consumption', 'productivity'}
+	end
 end
 
-local recipes_list =
-	{
-  "adam42-gen-laser",
-  "adam42-gen",
-  "agar",
-  "alien-enzymes",
-  "alien-sample-02",
-  "alien-sample-03",
-  "antelope",
-  "arthropod-blood-to-copper",
-  "arthropod-blood-to-organic-solvent",
-  "arthurian-food-01",
-  "arthurian-food-02",
-  "arthurian-grow-01",
-  "arthurian",
-  "artificial-blood",
-  "auog-food-01-sawdust",
-  "auog-food-01",
-  "auog-food-02-sawdust",
-  "auog-food-02",
-  "auog",
-  "bhoddos-sample",
-  "bhoddos-to-ti",
-  "bio-container",
-  "biobattery",
-  "biomass-1-a",
-  "biomass-1",
-  "biomass-2",
-  "biopolymer-2",
-  "blood-to-chlorine",
-  "blood-to-iron",
-  "blood-to-urea",
-  "blood-to-zinc",
-  "bones-to-phosphate",
-  "brain-guts-to-zinc",
-  "brain-to-zinc",
-  "cadaveric-arum-sample",
-  "cadaveric-to-copper",
-  "cadaveric-to-sulfur",
-  "cage",
-  "carapace-to-al",
-  "carapace-to-re",
-  "cdna",
-  "cellulose-00",
-  "cellulose-02",
-  "cellulose-gasification",
-  "chithin-to-phosphate",
-  "cobalt-extract",
-  "cobalt-fluoride",
-  "cobalt-nx",
-  "cobalt-oxide",
-  "cobalt-sulfate-02",
-  "cobalt-sulfate",
-  "coke-co2",
-  "concrete-02",
-  "cooling-system",
-  "cottongut-food-01",
-  "cottongut-food-02",
-  "cottongut-food-03",
-  "cridren-sample",
-  "cridren-seeds-to-mo",
-  "cysteine",
-  "cytostatics",
-  "decalin",
-  "dhilmos-food-01",
-  "dhilmos-food-02",
-  "dhilmos-grow-01",
-  "dhilmos",
-  "dingrits-food-01",
-  "dingrits-food-02",
-  "dna-polymerase-2",
-  "dna-polymerase",
-  "dried-grods-02",
-  "dried-grods",
-  "dynemicin",
-  "earth-antelope-sample",
-  "earth-bear-sample",
-  "earth-cow-sample",
-  "earth-crustacean-sample",
-  "earth-flower-sample",
-  "earth-generic-sample",
-  "earth-giraffe-sample",
-  "earth-horse-sample",
-  "earth-jute-sample",
-  "earth-lizard-sample",
-  "earth-palmtree-sample",
-  "earth-potato-sample",
-  "earth-roadrunner-sample",
-  "earth-sea-sponge-sample",
-  "earth-sunflower-sample",
-  "earth-tiger-sample",
-  "earth-tropical-tree-sample",
-  "earth-venus-fly-sample",
-  "earth-wolf-sample",
-  "empty-planter-box",
-  "enediyne",
-  "energy-drink",
-  "energy-drinkb",
-  "enzyme-pks",
-  "ethanol-combustion",
-  "ethanol",
-  "ethylene-from-fruit",
-  "fawogae-spore",
-  "fawogae-to-iron",
-  "fawogae-to-sulfur",
-  "fertilizer-1",
-  "fertilizer-3",
-  "fertilizer-4",
-  "fetal-serum-01",
-  "fiber-01",
-  "fiber-dry-storage",
-  "filtration-media-3",
-  "filtration-media-4",
-  "fish-food-01",
-  "fish-food-02",
-  "fish-oil-combustion",
-  "fish-oil",
-  "fish-to-iron",
-  "fish-to-phosphate",
-  "fish-to-tin",
-  "flavonoids",
-  "flutec-pp6",
-  "formamide",
-  "formic-acid",
-  "gas-bladder-to-natura-gas",
-  "gasoline-cellulose",
-  "grod-sample",
-  "grod-to-tin",
-  "grod-to-zinc",
-  "gta",
-  "guts-to-chlorine",
-  "guts-to-copper",
-  "guts-to-zinc",
-  "hcl-from-guts",
-  "hyaline",
-  "immunosupressants",
-  "kicalk-fiber",
-  "kicalk-sample",
-  "kicalk-to-iron",
-  "kmauts-ration-chitin",
-  "korlex-food-01",
-  "korlex-food-02",
-  "lab-instrument-2",
-  "lard-combustion",
-  "lard-from-brains",
-  "latex-slab",
-  "latex",
-  "lignin-to-aromatics",
-  "lignin",
-  "lime-from-shell",
-  "liquid-manure",
-  "log-wood-fast",
-  "manure-bacteria-fish",
-  "manure-bacteria",
-  "manure-to-biomass",
-  "manure-to-crude",
-  "manure-to-nitrogen",
-  "meat-and-gut-to-copper",
-  "meat-to-chromium",
-  "meat-to-copper",
-  "meat-to-cyanic",
-  "meat-to-iron",
-  "meat-to-nitrogen",
-  "meat-to-phosphate",
-  "meat-to-tin",
-  "methane-from-liquid-manure",
-  "microcin-j25",
-  "mixed-ores",
-  "mmp",
-  "mosfet",
-  "moss-gen",
-  "mukmoux-food-01",
-  "mukmoux-food-02",
-  "mukmoux",
-  "nano-cellulose",
-  "naven-coal",
-  "navens-sample",
-  "navens-spore",
-  "navens-to-ti",
-  "navens-to-tin",
-  "neuromorphic-chip",
-  "neuroprocessor",
-  "nitrogen-mustard",
-  "olechemicals-from-skin",
-  "oleochemical-combustion",
-  "oleochemicals-3",
-  "organics-from-wood-2",
-  "pacifastin",
-  "paper-towel",
-  "pelt-processing",
-  "peptidase-m58",
-  "petri-dish",
-  "phadai-food-01",
-  "phadai-food-02",
-  "phadai",
-  "phagnot-food-01",
-  "phagnot-food-02",
-  "phenol-02",
-  "phenol-3",
-  "pheromones",
-  "planter-box",
-  "plasmids",
-  "primers",
-  "primers-02",
-  "primers-03",
-  "propeptides",
-  "purine-analogues",
-  "py-science-pack-1-turd",
-  "py-science-pack-1",
-  "py-science-pack-2-turd",
-  "py-science-pack-2",
-  "py-science-pack-3-turd",
-  "py-science-pack-3",
-  "py-science-pack-4-turd",
-  "py-science-pack-4",
-  "ralesia-sample",
-  "ralesia-seeds-paper-towel",
-  "recombinant-ery-2",
-  "recombinant-ery-3",
-  "recombinant-ery",
-  "rennea-sample",
-  "rennea-seeds",
-  "rennea-to-copper",
-  "rennea-to-phosphate",
-  "replicator-bioreserve",
-  "replicator-ralesia",
-  "replicator-rennea",
-  "replicator-tuuphra",
-  "replicator-yotoi-fruit",
-  "replicator-yotoi",
-  "retrovirus-2",
-  "retrovirus",
-  "scrondrix",
-  "sea-sponge-processing-01",
-  "sea-sponge-sprouts-2",
-  "sea-sponge-sprouts-3",
-  "sea-sponge-sprouts-4",
-  "sea-sponge-sprouts-processing-01",
-  "sea-sponge-sprouts",
-  "sea-sponge",
-  "simik-food-01",
-  "simik-food-02",
-  "sodium-alginate",
-  "soil-separation-2",
-  "spikes-to-mo",
-  "stopper",
-  "sugar",
-  "sweet-syrup",
-  "syrup-01",
-  "tuupha-to-iron",
-  "tuuphra-sample",
-  "tuuphra-seeds",
-  "tuuphra-to-copper",
-  "tuuphra-to-mo",
-  "ulric-food-01",
-  "ulric-food-02",
-  "ulric",
-  "urea-from-liquid-manure",
-  "vrauks-food-01",
-  "vrauks-food-02",
-  "vrauks",
-  "wood-seedling",
-  "wood-seeds-to-phosphate",
-  "wood-seeds",
-  "workers-food-02",
-  "workers-food-03",
-  "workers-food",
-  "yaedol-to-sulfur",
-  "yaedols-sample",
-  "yaedols-spores",
-  "yaedols-to-copper",
-  "yotoi-cellulose",
-  "yotoi-fruit-to-chromium",
-  "yotoi-fruit-to-tin",
-  "yotoi-leaves-to-chromium",
-  "yotoi-leaves",
-  "yotoi-sample",
-  "yotoi-seed-to-chromium",
-  "yotoi-seeds-cold",
-  "yotoi-seeds",
-  "zinc-finger-proteins",
-  "zipir-food-01",
-  "zipir-food-02",
-  "zogna-bacteria-darkness",
-  "zogna-bacteria",
-  "zymogens",
-	}
+local recipes_list = {
+	'adam42-gen-laser',
+	'adam42-gen',
+	'agar',
+	'alien-enzymes',
+	'alien-sample-02',
+	'alien-sample-03',
+	'antelope',
+	'arthropod-blood-to-copper',
+	'arthropod-blood-to-organic-solvent',
+	'arthurian-food-01',
+	'arthurian-food-02',
+	'arthurian-grow-01',
+	'arthurian',
+	'artificial-blood',
+	'auog-food-01-sawdust',
+	'auog-food-01',
+	'auog-food-02-sawdust',
+	'auog-food-02',
+	'auog',
+	'bhoddos-sample',
+	'bhoddos-to-ti',
+	'bio-container',
+	'biobattery',
+	'biomass-1-a',
+	'biomass-1',
+	'biomass-2',
+	'biopolymer-2',
+	'blood-to-chlorine',
+	'blood-to-iron',
+	'blood-to-urea',
+	'blood-to-zinc',
+	'bones-to-phosphate',
+	'brain-guts-to-zinc',
+	'brain-to-zinc',
+	'cadaveric-arum-sample',
+	'cadaveric-to-copper',
+	'cadaveric-to-sulfur',
+	'cage',
+	'carapace-to-al',
+	'carapace-to-re',
+	'cdna',
+	'cellulose-00',
+	'cellulose-02',
+	'cellulose-gasification',
+	'chithin-to-phosphate',
+	'cobalt-extract',
+	'cobalt-fluoride',
+	'cobalt-nx',
+	'cobalt-oxide',
+	'cobalt-sulfate-02',
+	'cobalt-sulfate',
+	'coke-co2',
+	'concrete-02',
+	'cooling-system',
+	'cottongut-food-01',
+	'cottongut-food-02',
+	'cottongut-food-03',
+	'cridren-sample',
+	'cridren-seeds-to-mo',
+	'cysteine',
+	'cytostatics',
+	'decalin',
+	'dhilmos-food-01',
+	'dhilmos-food-02',
+	'dhilmos-grow-01',
+	'dhilmos',
+	'dingrits-food-01',
+	'dingrits-food-02',
+	'dna-polymerase-2',
+	'dna-polymerase',
+	'dried-grods-02',
+	'dried-grods',
+	'dynemicin',
+	'earth-antelope-sample',
+	'earth-bear-sample',
+	'earth-cow-sample',
+	'earth-crustacean-sample',
+	'earth-flower-sample',
+	'earth-generic-sample',
+	'earth-giraffe-sample',
+	'earth-horse-sample',
+	'earth-jute-sample',
+	'earth-lizard-sample',
+	'earth-palmtree-sample',
+	'earth-potato-sample',
+	'earth-roadrunner-sample',
+	'earth-sea-sponge-sample',
+	'earth-sunflower-sample',
+	'earth-tiger-sample',
+	'earth-tropical-tree-sample',
+	'earth-venus-fly-sample',
+	'earth-wolf-sample',
+	'empty-planter-box',
+	'enediyne',
+	'energy-drink',
+	'energy-drinkb',
+	'enzyme-pks',
+	'ethanol-combustion',
+	'ethanol',
+	'ethylene-from-fruit',
+	'fawogae-spore',
+	'fawogae-to-iron',
+	'fawogae-to-sulfur',
+	'fertilizer-1',
+	'fertilizer-3',
+	'fertilizer-4',
+	'fetal-serum-01',
+	'fiber-01',
+	'fiber-dry-storage',
+	'filtration-media-3',
+	'filtration-media-4',
+	'fish-food-01',
+	'fish-food-02',
+	'fish-oil-combustion',
+	'fish-oil',
+	'fish-to-iron',
+	'fish-to-phosphate',
+	'fish-to-tin',
+	'flavonoids',
+	'flutec-pp6',
+	'formamide',
+	'formic-acid',
+	'gas-bladder-to-natura-gas',
+	'gasoline-cellulose',
+	'grod-sample',
+	'grod-to-tin',
+	'grod-to-zinc',
+	'gta',
+	'guts-to-chlorine',
+	'guts-to-copper',
+	'guts-to-zinc',
+	'hcl-from-guts',
+	'hyaline',
+	'immunosupressants',
+	'kicalk-fiber',
+	'kicalk-sample',
+	'kicalk-to-iron',
+	'kmauts-ration-chitin',
+	'korlex-food-01',
+	'korlex-food-02',
+	'lab-instrument-2',
+	'lard-combustion',
+	'lard-from-brains',
+	'latex-slab',
+	'latex',
+	'lignin-to-aromatics',
+	'lignin',
+	'lime-from-shell',
+	'liquid-manure',
+	'log-wood-fast',
+	'manure-bacteria-fish',
+	'manure-bacteria',
+	'manure-to-biomass',
+	'manure-to-crude',
+	'manure-to-nitrogen',
+	'meat-and-gut-to-copper',
+	'meat-to-chromium',
+	'meat-to-copper',
+	'meat-to-cyanic',
+	'meat-to-iron',
+	'meat-to-nitrogen',
+	'meat-to-phosphate',
+	'meat-to-tin',
+	'methane-from-liquid-manure',
+	'microcin-j25',
+	'mixed-ores',
+	'mmp',
+	'mosfet',
+	'moss-gen',
+	'mukmoux-food-01',
+	'mukmoux-food-02',
+	'mukmoux',
+	'nano-cellulose',
+	'naven-coal',
+	'navens-sample',
+	'navens-spore',
+	'navens-to-ti',
+	'navens-to-tin',
+	'neuromorphic-chip',
+	'neuroprocessor',
+	'nitrogen-mustard',
+	'olechemicals-from-skin',
+	'oleochemical-combustion',
+	'oleochemicals-3',
+	'organics-from-wood-2',
+	'pacifastin',
+	'paper-towel',
+	'pelt-processing',
+	'peptidase-m58',
+	'petri-dish',
+	'phadai-food-01',
+	'phadai-food-02',
+	'phadai',
+	'phagnot-food-01',
+	'phagnot-food-02',
+	'phenol-02',
+	'phenol-3',
+	'pheromones',
+	'planter-box',
+	'plasmids',
+	'primers',
+	'primers-02',
+	'primers-03',
+	'propeptides',
+	'purine-analogues',
+	'py-science-pack-1-turd',
+	'py-science-pack-1',
+	'py-science-pack-2-turd',
+	'py-science-pack-2',
+	'py-science-pack-3-turd',
+	'py-science-pack-3',
+	'py-science-pack-4-turd',
+	'py-science-pack-4',
+	'ralesia-sample',
+	'ralesia-seeds-paper-towel',
+	'recombinant-ery-2',
+	'recombinant-ery-3',
+	'recombinant-ery',
+	'rennea-sample',
+	'rennea-seeds',
+	'rennea-to-copper',
+	'rennea-to-phosphate',
+	'replicator-bioreserve',
+	'replicator-ralesia',
+	'replicator-rennea',
+	'replicator-tuuphra',
+	'replicator-yotoi-fruit',
+	'replicator-yotoi',
+	'retrovirus-2',
+	'retrovirus',
+	'scrondrix',
+	'sea-sponge-processing-01',
+	'sea-sponge-sprouts-2',
+	'sea-sponge-sprouts-3',
+	'sea-sponge-sprouts-4',
+	'sea-sponge-sprouts-processing-01',
+	'sea-sponge-sprouts',
+	'sea-sponge',
+	'simik-food-01',
+	'simik-food-02',
+	'sodium-alginate',
+	'soil-separation-2',
+	'spikes-to-mo',
+	'stopper',
+	'sugar',
+	'sweet-syrup',
+	'syrup-01',
+	'tuupha-to-iron',
+	'tuuphra-sample',
+	'tuuphra-seeds',
+	'tuuphra-to-copper',
+	'tuuphra-to-mo',
+	'ulric-food-01',
+	'ulric-food-02',
+	'ulric',
+	'urea-from-liquid-manure',
+	'vrauks-food-01',
+	'vrauks-food-02',
+	'vrauks',
+	'wood-seedling',
+	'wood-seeds-to-phosphate',
+	'wood-seeds',
+	'workers-food-02',
+	'workers-food-03',
+	'workers-food',
+	'yaedol-to-sulfur',
+	'yaedols-sample',
+	'yaedols-spores',
+	'yaedols-to-copper',
+	'yotoi-cellulose',
+	'yotoi-fruit-to-chromium',
+	'yotoi-fruit-to-tin',
+	'yotoi-leaves-to-chromium',
+	'yotoi-leaves',
+	'yotoi-sample',
+	'yotoi-seed-to-chromium',
+	'yotoi-seeds-cold',
+	'yotoi-seeds',
+	'zinc-finger-proteins',
+	'zipir-food-01',
+	'zipir-food-02',
+	'zogna-bacteria-darkness',
+	'zogna-bacteria',
+	'zymogens'
+}
 
 --adding to module limitation list
 FUN.productivity(recipes_list)
 
-local mod_cats =
-  {
-    "tree",
-    "seaweed",
-    "moss",
-    "sap",
-    "ulric",
-    "sponge",
-    "ralesia",
-    "mukmoux",
-    "tuuphra",
-    "arthurian",
-    "navens",
-    "yotoi",
-    "rennea",
-    "dhilmos",
-    "scrondrix",
-    "phadai",
-    "auog",
-    "fish",
-    "yaedols",
-    "dingrits",
-    "kmauts",
-    "vonix",
-    "grod",
-    "phagnot",
-    "bhoddos",
-    "arqad",
-    "xeno",
-    "kicalk",
-    "cridren",
-    "antelope",
-    "zipir",
-    "trits",
-    "arum",
-    "vrauks",
-    "xyhiphoe",
-    "korlex",
-    "fawogae",
-    "moondrop",
-    "cottongut",
-    "guar"
-  }
+local mod_cats = {
+	'tree',
+	'seaweed',
+	'moss',
+	'sap',
+	'ulric',
+	'sponge',
+	'ralesia',
+	'mukmoux',
+	'tuuphra',
+	'arthurian',
+	'navens',
+	'yotoi',
+	'rennea',
+	'dhilmos',
+	'scrondrix',
+	'phadai',
+	'auog',
+	'fish',
+	'yaedols',
+	'dingrits',
+	'kmauts',
+	'vonix',
+	'grod',
+	'phagnot',
+	'bhoddos',
+	'arqad',
+	'xeno',
+	'kicalk',
+	'cridren',
+	'antelope',
+	'zipir',
+	'trits',
+	'arum',
+	'vrauks',
+	'xyhiphoe',
+	'korlex',
+	'fawogae',
+	'moondrop',
+	'cottongut',
+	'guar'
+}
 
---log(serpent.block(data.raw.module['effectivity-module']))
+-- MOUNTS
 
---log(serpent.block(data.raw.module["moondrop"]))
+local allowed_equipment = {
+	'active-defense-equipment',
+	'battery-equipment',
+	'belt-immunity-equipment',
+	'energy-shield-equipment',
+	'movement-bonus-equipment',
+	'roboport-equipment'
+}
+for _, equipments in pairs(allowed_equipment) do
+	for _, equipment in pairs(data.raw[equipments]) do
+		if equipment.name ~= 'ulric-infusion-equipment' then
+			equipment.categories = equipment.categories or {}
+			local contains = false
+			for _, category in pairs(equipment.categories) do
+				if category == 'py-mount-generator' then
+					contains = true
+					break
+				end
+			end
+			if not contains then
+				table.insert(equipment.categories, 'py-mount-generator')
+			end
+		end
+	end
+end
+local disallowed_equipment = {'generator-equipment', 'night-vision-equipment', 'solar-panel-equipment'}
+for _, equipments in pairs(disallowed_equipment) do
+	for _, equipment in pairs(data.raw[equipments]) do
+		local new_categories = {}
+		for _, category in pairs(equipment.categories or {}) do
+			if category ~= 'py-mount-generator' then
+				new_categories[#new_categories + 1] = category
+			end
+		end
+		equipment.categories = new_categories
+	end
+end
+data.raw['generator-equipment']['py-mount-generator'].categories = {'py-mount-generator'}
+
+-- END MOUNTS
\ No newline at end of file
diff --git a/data-updates.lua b/data-updates.lua
index 4999a948..ffa9a2d5 100644
--- a/data-updates.lua
+++ b/data-updates.lua
@@ -554,4 +554,4 @@ for _, character in pairs(data.raw.character) do
         end
         character.flags = new_flags  
     end
-end
+end
\ No newline at end of file
diff --git a/locale/en/tips.cfg b/locale/en/tips.cfg
index 688875a3..f41d47a2 100644
--- a/locale/en/tips.cfg
+++ b/locale/en/tips.cfg
@@ -2,6 +2,7 @@
 alienlife=Alien life
 farming=[item=native-flora] Farming
 caravans=[item=caravan] Caravans
+mounts=[item=crawdad] Mounts
 digosaurus=[item=digosaurus] Dig-o-saurus
 mega-farm=[item=replicator-bioreserve] Automated smart farms
 pydrive=[item=pydrive] Logistic stations
@@ -15,6 +16,7 @@ biofluid=[item=guano] Biofluid network
 [pywiki-descriptions]
 farming=The flora and fauna of this planet can be processed into multiple useful products. The [item=vrauks] bloodstream contains the useful [fluid=formic-acid] and [item=moondrop] can be processed into [fluid=methane].\n\nAll farmable species fall under one of three kingdoms; plant, animal, or fungi. [item=saps], [item=moss], [item=tree-mk01], [item=fish], and [item=seaweed] can be harvested from the local environment however most aliens must be synthesized through expensive GMO processes in the [entity=creature-chamber-mk01] or [entity=botanical-nursery]. This process will require DNA data stored in a codex such as [item=vrauks-codex] as well as genetic template data from the [entity=data-array].\n\nAfter you have obtained the first species, it’s important to breed further generations to avoid the complicated GMO process. Each kingdom has a unique breeding method.\n\nAnimal - Animal cubs/eggs such as [item=cocoon] can be bred in the [entity=rc-mk01]. This machine requires two parents inserted into the machine’s module slots. Once you have the young pups, each animal can be raised to adulthood in their respective enclosure such as [entity=vrauks-paddock-mk01]. This enclosure also requires adult creatures to be inserted in the module slots.\n\nPlant - Plants require seedlings such as [item=moondrop-seeds] to create the next generation. Convert adult crops into seedlings inside the [entity=botanical-nursery]. These seedlings can then be cultivated into adult crops in large farming structures such as [entity=moondrop-greenhouse-mk01]. Each farm building requires the adult crop to be placed in the module slot. Each cycle will yield more seeds than the input.\n\nFungi - Tiny mushroom spores are plentiful in the atmosphere. The [entity=spore-collector-mk01] will automatically process the air for spore particulates such as [item=fawogae-spore] at no input cost. These spores can then be grown into adult fungi in climatized shroom farms such as [entity=fawogae-plantation-mk01]. The fungi require special substrate material such as [item=fungal-substrate]. These buildings also require adult mushrooms inside the module slots.\n\nIn order to further optimize and increase the output of creature farms further genetic modification is possible up to MK04. This genetic upgrade will increase growth speeds by up to 400%. The most complicated animal species require more advanced data storage methods such as [item=zungror-codex-mk04].
 caravans=[item=caravan] is a living, organic logistics creature with 30 inventory slots and a programmable schedule, similar to a locomotive. It utilizes the biter pathfinding AI.\nThe caravan requires food to function. Each action or destination requires the caravan to consume food, with different types of food providing a different number of actions.\nYou can program the caravan to visit any entity. When it reaches its destination, you can program specific actions based on that destination. Caravans cannot be killed by trains or biters. There is also an [item=flyavan].\n\nActions available for different destinations include: \n- Wait: The caravan will stay at the destination. *Does not use food\n- Store Food: The caravan will fill its fuel slots from the destination’s inventory. *Does not use food\n- Fill Cargo (waiting checked): The caravan will extract items until its inventory is full.\n- Fill Cargo (waiting unchecked): The caravan will pick up anything that’s there and then execute the next action. \n- Empty Cargo (waiting checked): The caravan will empty its inventory and only continue if its inventory is completely empty .\n- Empty Cargo (waiting unchecked): The caravan will try to empty its inventory and then execute the next action, potentially leaving items in its inventory.\n- Until caravan has exactly N items (waiting checked): The caravan will pick up or drop off items until it has the specified amount.\n- Until caravan has exactly N items (waiting unchecked): The caravan will try to pick up or drop off items until it has the specified amount, immediately executing the next action if that's not possible. \n- Until target has exactly N items (waiting checked): The caravan will pick up or drop off items until the outpost has the specified amount.\n- Until target has exactly N items (waiting unchecked): The caravan will pick up or drop off items until the outpost has the specified amount, immediately executing the next action if that's not possible.\n- Circuit condition: The caravan will wait at the destination until the circuit condition is met. *Does not use food\n- Collect all autotrash: Collects all items from your player's autotrash inventory.\n\nActions available for different types of destinations include:\n- Player: [Wait, Store Food, Fill Cargo, Empty Cargo, Filtered Pickup, Filtered Dropoff, Collect all autotrash]\n- Outpost: [Wait, Store Food, Fill Cargo, Empty Cargo, Filtered Pickup, Filtered Dropoff, Circuit condition]\n- Another Caravan: [Wait, Store Food, Fill Cargo, Empty Cargo, Filtered Pickup, Filtered Dropoff]\n- Cargo Wagon: [Wait, Fill Cargo, Empty Cargo, Filtered Pickup, Filtered Dropoff]\n- Electric pole: [Wait, Circuit condition]\n- Default: [Wait]\n\nUse middle-click in an [entity=outpost] to set the filter. Don’t forget to leave a slot for food!
+mounts=Mounts are an effective form of personal transport for every stage of progression that can also help in combat. Each tier of mount has all the abilities of the previous mount. [item=hazard-concrete] and [item=refined-hazard-concrete] will prevent any mounts from crossing and can act as barriers to avoid destroying important infrastructure.\n\n [item=automation-science-pack]\n\nThe [entity=car] is the most basic and primitive mount. It runs on solid fuel such as [item=raw-coal] and has a top speed of 100km/h. The car is equipped with [item=vehicle-machine-gun] for small arms damage. It stores 80 stacks of items.\n\n [item=logistic-science-pack]\n\n[entity=crawdad] is the first biological mount. Crafted in a [entity=creature-chamber-mk01], this mount is capable of running at a top speed of 85km/h. This creature loves fish and eats [item=fish], [item=fish-mk02], [item=fish-mk03], and [item=fish-mk04]. While running it consumes 800kW. Due to its heavy armor, it is able to ram and destroy obstacles without taking any damage. It stores 90 stacks of items.\n[entity=crawdad] has a 10x4 armor equipment grid; however the center 4x4 tiles are permanently occupied by [item=py-mount-generator]. This generator taps into the biological energy created by the mount and instantly fills any equipment batteries by using the food fuel. Note that this generator is 200% efficient at converting food fuel into equipment grid energy. It’s extremely useful for personal robotics. No other generators are allowed inside the crawdad’s equipment grid.\n\n [item=chemical-science-pack]\n\n[item=dingrido] is a tamed and domesticated form of [item=dingrits]. This mount is able to run at over 250km/h! This mount loves meat products such as [item=meat], [item=dingrits-food-01], and [item=dingrits-food-01] and also benefits from the [item=py-mount-generator]. It stores 120 stacks of items and has a 10x6 equipment grid.\n\n [item=py-science-pack-3]\n\n[item=spidertron] is a mechanized version of the [item=zungror]. This cyborg life form is able to crawl on eight legs over almost any terrain. It travels at 110km/h and has high acceleration. This mount consumes energy stored inside [item=gastrocapacitor] and it uses the WASD driving mode. It is equipped with 4 cycling [item=spidertron-rocket-launcher-1] that can fire rockets at high speed. The [item=spidertron-remote] can be used to control [item=spidertron] from the map view. Using the remote, multiple [item=spidertron] can be programmed to follow each other in a chain. It stores 160 stacks of items and has a 10x8 equipment grid. This mount benefits from the [item=py-mount-generator].\n\n [item=utility-science-pack]\n\n[item=phadaisus] is the ultimate evolved version of [item=phadai]. It flies at hypersonic speeds over 270km/h and uses the WASD driving mode. This mount loves to eat [item=phadai-food-01] and [item=phadai-food-02] and can be controlled using the [item=spidertron-remote]. This mount has a devastating [item=dragon-breath] dealing 2100 fire damage/s to any entity in a 6 tile radius. This weapon completely decimates forests. The flame breath is fueled by [item=dragon-breath-ammo] which each provides ammo for five hours. It stores 200 stacks of items and has a 10x10 equipment grid. This mount benefits from the [item=py-mount-generator].
 digosaurus=[item=digosaurus] is one of the native species to this planet. Over years of evolution, they have adapted to collect and use [item=nexelit-ore] as an energy source. Exploit it.\nDig-o-saurus must be placed in the [entity=dino-dig-site]. The dig site has a range which it can mine the nexelit. It also requires electricity.\n\nDig-o-saurus requires food to work. Each food allows the Dig-o-saurs gather more ores in the same trip.\n[item=guts] → 1 ore\n[item=meat] → 2 ores\n[item=workers-food] → 8 ores\n[item=workers-food-02] → 16 ores\n[item=workers-food-03] → 32 ores\n\n[item=thikat] is a larger, genetically enhanced version of the Dig-o-saurus. Thikat has 100% mining productivity.\n[item=work-o-dile] has 200% mining productivity.\n\nFloor tiles such as [item=py-steel] can improve the running speed of the Digosaurus.
 mega-farm=The [entity=mega-farm] has the ability to cultivate patches of plants. You can pick a type of plant and a recipe for that plant, for example [recipe=bioreserve-super-1], then you have to feed the required materials. You then have to insert the collector, for example [item=replicator-bioreserve]. After inserting the collector, you have to 'launch' the 'rocket' - overhyped terms thought up by marketing, no doubt - which generates the patch of your chosen plants to the north of your building. This patch can then be harvested using the [entity=harvester].\n\nWhen the patch dries up, you can repeat the process, for a renewable source of plants such as [item=native-flora]. More complex recipes generate richer patches.
 pydrive=You’ve created a species of giant, super fast, yet docile worms. They are able to transfer items instantaneously between different [entity=pydrive] buildings, as long as those buildings are tuned to the identification of the same worm.\n\nUse the rings of checkboxes to select a specific worm - every pattern of checked and unchecked boxes will select a different worm. Your items will still be with the worm if no logistic station is tuned to that worm, you can retrieve them by tuning to that worm again.\n\n[entity=pydrive] requires 10MW of continuous electricity.
diff --git a/prototypes/creatures/crawdad.lua b/prototypes/creatures/crawdad.lua
index 3865fbe0..c4f95ffe 100644
--- a/prototypes/creatures/crawdad.lua
+++ b/prototypes/creatures/crawdad.lua
@@ -1,14 +1,12 @@
 local util = require('util')
 
-local categories = table.deepcopy(data.raw['equipment-grid']['spidertron-equipment-grid']['equipment_categories'])
-categories[#categories + 1] = 'py-mount-generator'
 for i = 4, 10, 2 do
 	data:extend{{
 		name = 'mount-grid-10x' .. i,
 		type = 'equipment-grid',
 		width = 10,
 		height = i,
-		equipment_categories = categories
+		equipment_categories = {'py-mount-generator'}
 	}}
 end
 
@@ -17,7 +15,6 @@ data:extend{
 		name = 'py-mount-generator',
 		type = 'generator-equipment',
 		power = '1W',
-		categories = {'py-mount-generator'},
 		shape = {
 			type = 'full',
 			width = 4,
@@ -39,8 +36,10 @@ data:extend{
 	{
 		type = 'item',
 		name = 'py-mount-generator',
-		icon = '__core__/graphics/empty.png',
-		icon_size = 1,
+		icon = '__pyalienlifegraphics__/graphics/heart.png',
+		icon_size = 256,
+		localised_name = {'equipment-name.py-mount-generator'},
+		localised_description = {'equipment-description.py-mount-generator'},
 		stack_size = 1,
 		subgroup = 'py-alienlife-buildings-others',
 		flags = {'hidden', 'not-stackable', 'only-in-cursor'},
@@ -137,7 +136,7 @@ data:extend{{
 	},
 	consumption = '800kW',
 	--terrain_friction_modifier = 0.01,
-	friction = 2e-3,
+	friction = 0.002,
 	light = {
 		{
 			type = 'oriented',
@@ -293,7 +292,7 @@ data:extend{{
 	close_sound = {filename = '__pyalienlifegraphics3__/sounds/crawdad-out.ogg', volume = 0.5},
 	rotation_speed = 0.015,
 	weight = 10000,
-	inventory_size = 80,
+	inventory_size = 90,
 	guns = {},
 	equipment_grid = 'mount-grid-10x4',
 	minimap_representation = {
diff --git a/prototypes/items/items2.lua b/prototypes/items/items2.lua
index 1e3a3105..af293319 100644
--- a/prototypes/items/items2.lua
+++ b/prototypes/items/items2.lua
@@ -520,7 +520,7 @@ ITEM {
 	fuel_category = 'gastrocapacitor',
 	fuel_value = '2GJ',
 	fuel_acceleration_multiplier = 1,
-	fuel_top_speed_multiplier = 1.8
+	fuel_top_speed_multiplier = 3
 }
 
 ITEM {
diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua
index 60425524..b6cf78f4 100644
--- a/prototypes/updates/base-updates.lua
+++ b/prototypes/updates/base-updates.lua
@@ -100,4 +100,6 @@ RECIPE('military-science-pack'):change_category('research')
 RECIPE('production-science-pack'):change_category('research')
 RECIPE('utility-science-pack'):change_category('research'):add_ingredient({type = 'item', name = 'perfect-samples', amount = 1})
 
-ENTITY('beacon', 'beacon'):set_fields{allowed_effects = {'consumption', 'speed'} }
\ No newline at end of file
+ENTITY('beacon', 'beacon'):set_fields{allowed_effects = {'consumption', 'speed'} }
+
+RECIPE('car'):add_ingredient('light-armor')
\ No newline at end of file
diff --git a/scripts/wiki/text-pages.lua b/scripts/wiki/text-pages.lua
index d2372baf..d21338d9 100644
--- a/scripts/wiki/text-pages.lua
+++ b/scripts/wiki/text-pages.lua
@@ -16,6 +16,12 @@ Wiki.events.on_init = function()
         text_only = true
     })
 
+    remote.call('pywiki', 'add_page', {
+        name = 'mounts',
+        section = 'alienlife',
+        text_only = true
+    })
+
     remote.call('pywiki', 'add_page', {
         name = 'digosaurus',
         section = 'alienlife',