diff --git a/archipelago_biome_server.lua b/archipelago_biome_server.lua
index 44180e7..eb49ac1 100644
--- a/archipelago_biome_server.lua
+++ b/archipelago_biome_server.lua
@@ -6,9 +6,8 @@ print("Archipelago Biome Mod version 20.12.5")
 redo dock urgent, it is ugly
 	fish anywhere near water, docks will be just a prefered place
 
-ace tree/bush farm system
-
 seaweed seeds
+	seaweed ace farm
 
 add jellyfish
 rework pirate hat
diff --git a/entities/crops/palm_tree_crop/palm_tree_crop.json b/entities/crops/palm_tree_crop/palm_tree_crop.json
index e2c7f39..9a1b5bc 100644
--- a/entities/crops/palm_tree_crop/palm_tree_crop.json
+++ b/entities/crops/palm_tree_crop/palm_tree_crop.json
@@ -39,7 +39,9 @@
 				"palm_tree_4": "archipelago_biome:trees:palm:sapling"
 			},
 			"harvest_threshhold": "palm_tree_4",
-			"plant_overlay_effect": "stonehearth:effects:plant_crop_overlay_effect"
+			"plant_overlay_effect": "stonehearth:effects:plant_crop_overlay_effect",
+			"megacrop_chance": 0,
+			"auto_harvest": "place"
 		},
 		"stonehearth:growing": {
 			"growth_period": "1d",
diff --git a/entities/decoration/magma/magma.json b/entities/decoration/magma/magma.json
index 5084499..3358a55 100644
--- a/entities/decoration/magma/magma.json
+++ b/entities/decoration/magma/magma.json
@@ -17,6 +17,18 @@
 				"max":6,
 			}
 		},
+		"stonehearth:buffs": {
+			"buffs": {
+				"stonehearth_ace:buffs:weather:warmth_source": true
+			}
+		},
+		"sensor_list": {
+			"sensors": {
+				"warmth": {
+					"radius": 8
+				}
+			}
+		},
 		"effect_list": {
 			"default": "archipelago_biome:effects:magma"
 		},
diff --git a/jobs/fisher/fisher_firepit/fisher_firepit.png b/jobs/fisher/fisher_firepit/fisher_firepit.png
index 7cb0d72..351fa07 100644
Binary files a/jobs/fisher/fisher_firepit/fisher_firepit.png and b/jobs/fisher/fisher_firepit/fisher_firepit.png differ
diff --git a/jobs/fisher/fisher_firepit/fisher_firepit.qb b/jobs/fisher/fisher_firepit/fisher_firepit.qb
index 0b51e78..6ac3eee 100644
Binary files a/jobs/fisher/fisher_firepit/fisher_firepit.qb and b/jobs/fisher/fisher_firepit/fisher_firepit.qb differ
diff --git a/jobs/fisher/fisher_firepit/fisher_firepit_ghost.json b/jobs/fisher/fisher_firepit/fisher_firepit_ghost.json
index 7f0417f..fd3bae6 100644
--- a/jobs/fisher/fisher_firepit/fisher_firepit_ghost.json
+++ b/jobs/fisher/fisher_firepit/fisher_firepit_ghost.json
@@ -10,6 +10,11 @@
 				"models": [
 					"file(fisher_firepit.qb)"
 				]
+			},
+			"no_fuel": {
+				"models": [
+					"file(fisher_firepit_no_fuel.qb)"
+				]
 			}
 		}
 	},
diff --git a/jobs/fisher/fisher_firepit/fisher_firepit_no_fuel.qb b/jobs/fisher/fisher_firepit/fisher_firepit_no_fuel.qb
new file mode 100644
index 0000000..f495cbb
Binary files /dev/null and b/jobs/fisher/fisher_firepit/fisher_firepit_no_fuel.qb differ
diff --git a/manifest.json b/manifest.json
index ba3acda..df46968 100644
--- a/manifest.json
+++ b/manifest.json
@@ -392,6 +392,11 @@
 
 		"stonehearth:farmer:all_crops": "file(services/server/farming/data/all_crops.json)",
 
+		"archipelago_biome:fisher:firepit":	"stonehearth_ace:mixins:workbench:cook_oven",
+
+		"archipelago_biome:jobs:fisher":"stonehearth_ace/archipelago_biome/jobs/fisher/ace_description.json",
+		"archipelago_biome/jobs/fisher/fisher_abilities/fisher_abilities.json":"stonehearth_ace/archipelago_biome/jobs/common/ace_abilities.json",
+
 		"stonehearth:jobs:index": "file(jobs/index.json)",
 		"nordlingmod:jobs:index":"file(jobs/index_nordlings.json)",
 		"stonehearth/jobs/blacksmith/recipes/recipes.json":			"file(jobs/blacksmith/recipes)",
@@ -449,9 +454,6 @@
 		"archipelago_biome:weapons:crab_pincer":"stonehearth_ace:mixins:weapons:mainhand",
 		"archipelago_biome:weapons:slap_fish":	"stonehearth_ace:mixins:weapons:mainhand",
 
-		"archipelago_biome:jobs:fisher":"stonehearth_ace/archipelago_biome/jobs/fisher/ace_description.json",
-		"archipelago_biome/jobs/fisher/fisher_abilities/fisher_abilities.json":"stonehearth_ace/archipelago_biome/jobs/common/ace_abilities.json",
-
 		"brewerymod/manifest.json":		"file(modding_mods/brewerymod/manifest.json)",
 		"tower_defense/manifest.json":	"file(modding_mods/tower_defense/manifest.json)"
 	},
diff --git a/services/server/farming/data/all_crops.json b/services/server/farming/data/all_crops.json
index 7ee26e4..1173ca2 100644
--- a/services/server/farming/data/all_crops.json
+++ b/services/server/farming/data/all_crops.json
@@ -3,7 +3,10 @@
 		"palm_tree": {
 			"crop_type": "archipelago_biome:crops:palm_tree_crop",
 			"ordinal": 12.99465,
-			"level_requirement": 5
+			"level_requirement": 5,
+			"field_types": {
+				"orchard": true
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/update_log.txt b/update_log.txt
index 3aa32ad..e60863d 100644
--- a/update_log.txt
+++ b/update_log.txt
@@ -1,13 +1,11 @@
 Additions:
 
 Changes:
-Volcano smoke emitter is located inside a volcano and can be easily moved or destroyed by players
-Hearthlings will avoid stepping on top of magma blocks
 
 Changes for ACE:
-Removed old ace fish trap recipe
-Fisher can use fish traps like the trapper
-Tiki Torches will give warm buffs for those around it
+Updated fisher firepit model and now using ace fuel system
+Palm trees are one of the new options for orchard farms while on the biome
+Magma from volcanos give warm buff
 
 Fixes:
 (for ACE mod)
\ No newline at end of file