diff --git a/GdpdExample/addons/gdpd/bin/osx/libgdpd.dylib b/GdpdExample/addons/gdpd/bin/osx/libgdpd.dylib
index 63b2f14..f220301 100755
Binary files a/GdpdExample/addons/gdpd/bin/osx/libgdpd.dylib and b/GdpdExample/addons/gdpd/bin/osx/libgdpd.dylib differ
diff --git a/SConstruct b/SConstruct
index cd3b3a9..89b5572 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'Gd
 opts.Add(PathVariable('target_name', 'The library name.', 'libgdpd', PathVariable.PathAccept))
 
 # Local dependency paths, adapt them to your setup
-godot_headers_path = "src/godot-cpp/godot_headers/"
+godot_headers_path = "src/godot-cpp/godot-headers/"
 cpp_bindings_path = "src/godot-cpp/"
 cpp_library = "libgodot-cpp"
 earplug_headers_path = "src/externals/earplug/"
@@ -53,13 +53,13 @@ if env['platform'] == "osx":
     env['target_path'] += 'osx/'
     cpp_library += '.osx'
     env.Append(CPPDEFINES=['__MACOSX_CORE__', 'HAVE_UNISTD_H', 'LIBPD_EXTRA'])
+    env.Append(LINKFLAGS=['-arch', 'x86_64', '-arch', 'arm64', '-framework', 'CoreAudio', '-framework', 'CoreFoundation'])
+    env.Append(CCFLAGS=['-arch', 'x86_64', '-arch', 'arm64'])
     env.Append(CXXFLAGS=['-std=c++17'])
-    env.Append(LINKFLAGS=['-arch', 'x86_64','-framework',
-                          'CoreAudio', '-framework', 'CoreFoundation'])
     if env['target'] in ('debug', 'd'):
-        env.Append(CCFLAGS=['-g', '-O2', '-arch', 'x86_64'])
+        env.Append(CCFLAGS=['-g', '-O2'])
     else:
-        env.Append(CCFLAGS=['-g', '-O3', '-arch', 'x86_64'])
+        env.Append(CCFLAGS=['-g', '-O3'])
 
 elif env['platform'] in ('x11', 'linux'):
     env['CC'] = 'gcc-7'
@@ -143,7 +143,7 @@ else:
 cpp_library += '.' + str(bits)
 
 # make sure our binding library is properly included
-env.Append(CPPPATH=['.', earplug_headers_path, godot_headers_path, cpp_bindings_path + 'include/', cpp_bindings_path + 'include/core/', cpp_bindings_path + 'include/gen/', 'src/libpd/cpp','src/libpd/pure-data/src', 'src/libpd/libpd_wrapper', 'src/libpd/libpd_wrapper/util', 'src/rtaudio'])
+env.Append(CPPPATH=['.', earplug_headers_path, godot_headers_path, cpp_bindings_path + 'include/', cpp_bindings_path + 'include/core/', cpp_bindings_path + 'include/gen/', 'src/libpd/cpp', 'src/libpd/libpd_wrapper', 'src/libpd/pure-data/src', 'src/libpd/libpd_wrapper/util', 'src/rtaudio'])
 env.Append(LIBPATH=[cpp_bindings_path + 'bin/'])
 env.Append(LIBS=[cpp_library])
 env.Append(CFLAGS=['-DUSEAPI_DUMMY', '-DPD', '-DHAVE_UNISTD_H', '-D_GNU_SOURCE'])
@@ -151,7 +151,106 @@ env.Append(CFLAGS=['-DUSEAPI_DUMMY', '-DPD', '-DHAVE_UNISTD_H', '-D_GNU_SOURCE']
 # tweak this if you want to use different folders, or more folders, to store your source code in.
 env.Append(CPPPATH=['src/'])
 
-sources = Glob('src/*.cpp') + Glob('src/externals/earplug/*.c') + Glob('src/rtaudio/*.cpp') + Glob('src/libpd/libpd_wrapper/*.c') + Glob('src/libpd/libpd_wrapper/util/*.c') + Glob('src/libpd/pure-data/extra/**/*.c') + Glob('src/libpd/pure-data/src/[xmgz]_*.c') + Glob('src/libpd/pure-data/src/d_[acgmorsu]*.c') + Glob('src/libpd/pure-data/src/d_dac.c') + Glob('src/libpd/pure-data/src/d_delay.c') + Glob('src/libpd/pure-data/src/d_fft.c') + Glob('src/libpd/pure-data/src/d_fft_fftsg.c') + Glob('src/libpd/pure-data/src/d_filter.c') + Glob('src/libpd/pure-data/src/s_audio.c') + Glob('src/libpd/pure-data/src/s_audio_dummy.c') + Glob('src/libpd/pure-data/src/s_print.c') + Glob('src/libpd/pure-data/src/s_path.c')  + Glob('src/libpd/pure-data/src/s_main.c') + Glob('src/libpd/pure-data/src/s_inter.c') + Glob('src/libpd/pure-data/src/s_utf8.c') + Glob('src/libpd/pure-data/src/s_loader.c') + Glob('src/libpd/pure-data/extra/*.c') + Glob('src/libpd/pure-data/extra/earplug/*.c')
+# libpd src list: https://github.com/libpd/libpd/blob/d46caa4918bfe07eec08999146e496eb0f744b95/Makefile#L71
+sources = Glob('src/*.cpp') \
+        + Glob('src/externals/earplug/*.c') \
+        + Glob('src/rtaudio/*.cpp') \
+        + Glob('src/libpd/pure-data/src/d_arithmetic.c') \
+        + Glob('src/libpd/pure-data/src/d_array.c') \
+        + Glob('src/libpd/pure-data/src/d_ctl.c') \
+        + Glob('src/libpd/pure-data/src/d_dac.c') \
+        + Glob('src/libpd/pure-data/src/d_delay.c') \
+        + Glob('src/libpd/pure-data/src/d_fft.c') \
+        + Glob('src/libpd/pure-data/src/d_fft_fftsg.c') \
+        + Glob('src/libpd/pure-data/src/d_filter.c') \
+        + Glob('src/libpd/pure-data/src/d_global.c') \
+        + Glob('src/libpd/pure-data/src/d_math.c') \
+        + Glob('src/libpd/pure-data/src/d_misc.c') \
+        + Glob('src/libpd/pure-data/src/d_osc.c') \
+        + Glob('src/libpd/pure-data/src/d_resample.c') \
+        + Glob('src/libpd/pure-data/src/d_soundfile.c') \
+        + Glob('src/libpd/pure-data/src/d_soundfile_aiff.c') \
+        + Glob('src/libpd/pure-data/src/d_soundfile_caf.c') \
+        + Glob('src/libpd/pure-data/src/d_soundfile_next.c') \
+        + Glob('src/libpd/pure-data/src/d_soundfile_wave.c') \
+        + Glob('src/libpd/pure-data/src/d_ugen.c') \
+        + Glob('src/libpd/pure-data/src/g_all_guis.c') \
+        + Glob('src/libpd/pure-data/src/g_array.c') \
+        + Glob('src/libpd/pure-data/src/g_bang.c') \
+        + Glob('src/libpd/pure-data/src/g_canvas.c') \
+        + Glob('src/libpd/pure-data/src/g_clone.c') \
+        + Glob('src/libpd/pure-data/src/g_editor.c') \
+        + Glob('src/libpd/pure-data/src/g_editor_extras.c') \
+        + Glob('src/libpd/pure-data/src/g_graph.c') \
+        + Glob('src/libpd/pure-data/src/g_guiconnect.c') \
+        + Glob('src/libpd/pure-data/src/g_io.c') \
+        + Glob('src/libpd/pure-data/src/g_mycanvas.c') \
+        + Glob('src/libpd/pure-data/src/g_numbox.c') \
+        + Glob('src/libpd/pure-data/src/g_radio.c') \
+        + Glob('src/libpd/pure-data/src/g_readwrite.c') \
+        + Glob('src/libpd/pure-data/src/g_rtext.c') \
+        + Glob('src/libpd/pure-data/src/g_scalar.c') \
+        + Glob('src/libpd/pure-data/src/g_slider.c') \
+        + Glob('src/libpd/pure-data/src/g_template.c') \
+        + Glob('src/libpd/pure-data/src/g_text.c') \
+        + Glob('src/libpd/pure-data/src/g_toggle.c') \
+        + Glob('src/libpd/pure-data/src/g_traversal.c') \
+        + Glob('src/libpd/pure-data/src/g_undo.c') \
+        + Glob('src/libpd/pure-data/src/g_vumeter.c') \
+        + Glob('src/libpd/pure-data/src/m_atom.c') \
+        + Glob('src/libpd/pure-data/src/m_binbuf.c') \
+        + Glob('src/libpd/pure-data/src/m_class.c') \
+        + Glob('src/libpd/pure-data/src/m_conf.c') \
+        + Glob('src/libpd/pure-data/src/m_glob.c') \
+        + Glob('src/libpd/pure-data/src/m_memory.c') \
+        + Glob('src/libpd/pure-data/src/m_obj.c') \
+        + Glob('src/libpd/pure-data/src/m_pd.c') \
+        + Glob('src/libpd/pure-data/src/m_sched.c') \
+        + Glob('src/libpd/pure-data/src/s_audio.c') \
+        + Glob('src/libpd/pure-data/src/s_audio_dummy.c') \
+        + Glob('src/libpd/pure-data/src/s_inter.c') \
+        + Glob('src/libpd/pure-data/src/s_inter_gui.c') \
+        + Glob('src/libpd/pure-data/src/s_loader.c') \
+        + Glob('src/libpd/pure-data/src/s_main.c') \
+        + Glob('src/libpd/pure-data/src/s_net.c') \
+        + Glob('src/libpd/pure-data/src/s_path.c') \
+        + Glob('src/libpd/pure-data/src/s_print.c') \
+        + Glob('src/libpd/pure-data/src/s_utf8.c') \
+        + Glob('src/libpd/pure-data/src/x_acoustics.c') \
+        + Glob('src/libpd/pure-data/src/x_arithmetic.c') \
+        + Glob('src/libpd/pure-data/src/x_array.c') \
+        + Glob('src/libpd/pure-data/src/x_connective.c') \
+        + Glob('src/libpd/pure-data/src/x_file.c') \
+        + Glob('src/libpd/pure-data/src/x_gui.c') \
+        + Glob('src/libpd/pure-data/src/x_interface.c') \
+        + Glob('src/libpd/pure-data/src/x_list.c') \
+        + Glob('src/libpd/pure-data/src/x_midi.c') \
+        + Glob('src/libpd/pure-data/src/x_misc.c') \
+        + Glob('src/libpd/pure-data/src/x_net.c') \
+        + Glob('src/libpd/pure-data/src/x_scalar.c') \
+        + Glob('src/libpd/pure-data/src/x_text.c') \
+        + Glob('src/libpd/pure-data/src/x_time.c') \
+        + Glob('src/libpd/pure-data/src/x_vexp.c') \
+        + Glob('src/libpd/pure-data/src/x_vexp_if.c') \
+        + Glob('src/libpd/pure-data/src/x_vexp_fun.c') \
+        + Glob('src/libpd/libpd_wrapper/s_libpdmidi.c') \
+        + Glob('src/libpd/libpd_wrapper/x_libpdreceive.c') \
+        + Glob('src/libpd/libpd_wrapper/z_hooks.c') \
+        + Glob('src/libpd/libpd_wrapper/z_libpd.c') \
+        + Glob('src/libpd/pure-data/extra/bob~/bob~.c') \
+        + Glob('src/libpd/pure-data/extra/bonk~/bonk~.c') \
+        + Glob('src/libpd/pure-data/extra/choice/choice.c') \
+        + Glob('src/libpd/pure-data/extra/fiddle~/fiddle~.c') \
+        + Glob('src/libpd/pure-data/extra/loop~/loop~.c') \
+        + Glob('src/libpd/pure-data/extra/lrshift~/lrshift~.c') \
+        + Glob('src/libpd/pure-data/extra/pique/pique.c') \
+        + Glob('src/libpd/pure-data/extra/pd~/pdsched.c') \
+        + Glob('src/libpd/pure-data/extra/pd~/pd~.c') \
+        + Glob('src/libpd/pure-data/extra/sigmund~/sigmund~.c') \
+        + Glob('src/libpd/pure-data/extra/stdout/stdout.c') \
+        + Glob('src/libpd/libpd_wrapper/util/z_print_util.c') \
+        + Glob('src/libpd/libpd_wrapper/util/z_queued.c') \
+        + Glob('src/libpd/libpd_wrapper/util/ringbuffer.c')
 
 library = env.SharedLibrary(target=env['target_path'] + env['target_name'] , source=sources)
 
diff --git a/src/godot-cpp b/src/godot-cpp
index 3ee07f6..76d6ad5 160000
--- a/src/godot-cpp
+++ b/src/godot-cpp
@@ -1 +1 @@
-Subproject commit 3ee07f652bbbe91630a8346e3fe39a05f0f1d76a
+Subproject commit 76d6ad5d8db23b086b175d785812744d2bacf62a
diff --git a/src/libpd b/src/libpd
index e07d211..f1f8967 160000
--- a/src/libpd
+++ b/src/libpd
@@ -1 +1 @@
-Subproject commit e07d211d7b7e5f8dd6d2e3ddce557ae453161a14
+Subproject commit f1f8967e663027937e7934a357aff5fb116367c4