diff --git a/1_20_3/data/ame_load/functions/load/all.mcfunction b/1_20_3/data/ame_load/functions/load/all.mcfunction
index 48c0d49..b3234e6 100644
--- a/1_20_3/data/ame_load/functions/load/all.mcfunction
+++ b/1_20_3/data/ame_load/functions/load/all.mcfunction
@@ -1,5 +1,5 @@
 # Send Debug Message
-summon minecraft:marker 0 -64 0 {Tags:["ame.init"],CustomName:{text:"AME/Load",italic:0b,color:"gold",bold:1b}}
+summon minecraft:marker 0 -64 0 {Tags:["ame.init"],CustomName:'{"text":"AME/Load","italic":false,"color":"gold","bold":true}'}
 execute as @e[type=minecraft:marker,limit=1,tag=ame.init] run say Loading...
 kill @e[type=minecraft:marker,tag=ame.init]
 
@@ -31,4 +31,4 @@ data modify storage macro:input message set value "Loaded."
 data modify storage macro:input color set value "green"
 function macro:log/add with storage macro:input {}
 
-function ame_load:load/internal/finalize
\ No newline at end of file
+function ame_load:load/internal/finalize
diff --git a/1_20_3/data/ame_load/functions/load/internal/finalize.mcfunction b/1_20_3/data/ame_load/functions/load/internal/finalize.mcfunction
index 77da593..1ac2230 100644
--- a/1_20_3/data/ame_load/functions/load/internal/finalize.mcfunction
+++ b/1_20_3/data/ame_load/functions/load/internal/finalize.mcfunction
@@ -13,6 +13,6 @@ data remove storage macro:input level
 data remove storage macro:input color
 
 # Send Debug Message
-summon minecraft:marker 0 -64 0 {Tags:["ame.done"],CustomName:{text:"AME/Load",italic:0b,color:"gold",bold:1b}}
+summon minecraft:marker 0 -64 0 {Tags:["ame.done"],CustomName:'{"text":"AME/Load","italic":false,"color":"gold","bold":true}'}
 execute as @e[type=minecraft:marker,limit=1,tag=ame.done] run say Done...
-kill @e[type=minecraft:marker,tag=ame.done]
\ No newline at end of file
+kill @e[type=minecraft:marker,tag=ame.done]
diff --git a/1_20_3/data/macro/functions/inv/cursor_item.mcfunction b/1_20_3/data/macro/functions/inv/cursor_item.mcfunction
index b1bb660..9cf52dd 100644
--- a/1_20_3/data/macro/functions/inv/cursor_item.mcfunction
+++ b/1_20_3/data/macro/functions/inv/cursor_item.mcfunction
@@ -1,2 +1,2 @@
 # 1.20.3 does not have a real player.cursor slot; this fallback checks the held item.
-$execute as @a at @s if entity @s[nbt={SelectedItem:{tag:{wand:"$(customData)"}}}] run $(invoke)
+$execute as @a at @s if entity @s[nbt={SelectedItem:{tag:$(customData)}}] run $(invoke)
diff --git a/data/macro/function/player/run_cmd_as_uuid_macro.mcfunction b/data/macro/function/player/run_cmd_as_uuid_macro.mcfunction
new file mode 100644
index 0000000..19a75fc
--- /dev/null
+++ b/data/macro/function/player/run_cmd_as_uuid_macro.mcfunction
@@ -0,0 +1 @@
+$execute as @a[nbt={UUID:$(uuid)}] run $(cmd)
diff --git a/data/macro/function/player/run_func_as_uuid_macro.mcfunction b/data/macro/function/player/run_func_as_uuid_macro.mcfunction
new file mode 100644
index 0000000..6e4a505
--- /dev/null
+++ b/data/macro/function/player/run_func_as_uuid_macro.mcfunction
@@ -0,0 +1 @@
+$execute as @a[nbt={UUID:$(uuid)}] run function $(func)