diff --git a/Makefile b/Makefile
index 9deec8b..d33a1b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-CXXFLAGS += -std=c++17 -g3 -ggdb -O0 \
+CXXFLAGS += -std=c++20 -g3 -ggdb -O0 \
             -pedantic -Wall -Wextra -Werror -Weffc++ -Wconversion \
-            -fno-exceptions -fno-threadsafe-statics -fno-rtti #-fstack-usage
+            -fno-exceptions -fno-rtti
 
 CXXFILES := $(wildcard libalee/*.cpp)
 OBJFILES := $(subst .cpp,.o,$(CXXFILES))
@@ -8,15 +8,15 @@ LIBFILE := libalee/libalee.a
 
 all: alee
 
-msp430: CXX := msp430-elf32-g++
-msp430: AR := msp430-elf32-gcc-ar
+msp430: CXX := msp430-elf-g++
+msp430: AR := msp430-elf-gcc-ar
 msp430: CXXFLAGS += -I.
 msp430: CXXFLAGS += -Os -mmcu=msp430g2553 -ffunction-sections -fdata-sections
-msp430: CXXFLAGS += -DMEMDICTSIZE=200 -flto
-msp430: LDFLAGS += -L/opt/msp430-elf32/include -Tmsp430/msp430g2553.ld -Wl,-gc-sections
+msp430: CXXFLAGS += -DMEMDICTSIZE=128 -flto -fno-asynchronous-unwind-tables -fno-threadsafe-statics -fno-stack-protector
+msp430: LDFLAGS += -L/usr/msp430-elf/usr/include -Tmsp430/msp430g2553.ld -Wl,-gc-sections
 msp430: clean-lib msp430/alee-msp430
 
-small: CXXFLAGS += -Os
+small: CXXFLAGS += -Os -fno-asynchronous-unwind-tables -fno-threadsafe-statics -fno-stack-protector
 small: alee
 
 fast: CXXFLAGS += -O3 -march=native -mtune=native -flto