diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ed52bd..87e2cce 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,4 +19,4 @@ jobs:
         env:
             SRCPATH: ./cmd/gotop
         with:
-          args: darwin/amd64 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386
+          args: darwin/amd64 darwin/arm64 linux/amd64 linux/386 linux/arm64 linux/arm7 linux/arm6 linux/arm5 windows/amd64 windows/386 freebsd/amd64 freebsd/386
diff --git a/config.go b/config.go
index 9f59f56..7ff2947 100644
--- a/config.go
+++ b/config.go
@@ -20,6 +20,7 @@ import (
 	"github.com/xxxserxxx/lingo/v2"
 )
 
+// FIXME github action uses old(er) Go version that doesn't have embed
 //go:embed "dicts/*.toml"
 var Dicts embed.FS
 
@@ -50,6 +51,7 @@ type Config struct {
 	NvidiaRefresh        time.Duration
 }
 
+// FIXME parsing can't handle blank lines
 func NewConfig() Config {
 	cd := configdir.New("", "gotop")
 	cd.LocalPath, _ = filepath.Abs(".")
diff --git a/devices/mem.go b/devices/mem.go
index ceff9d6..61c8243 100644
--- a/devices/mem.go
+++ b/devices/mem.go
@@ -5,6 +5,7 @@ import "log"
 var memFuncs []func(map[string]MemoryInfo) map[string]error
 
 // TODO Colors are wrong for #mem > 2
+// TODO Swap memory values for remote devices is bogus
 type MemoryInfo struct {
 	Total       uint64
 	Used        uint64
diff --git a/devices/remote.go b/devices/remote.go
index 2366aab..555df3e 100644
--- a/devices/remote.go
+++ b/devices/remote.go
@@ -23,8 +23,9 @@ var remoteLock sync.Mutex
 // TODO network resiliency; I believe it currently crashes gotop when the network goes down
 // TODO Replace custom decoder with https://github.com/prometheus/common/blob/master/expfmt/decode.go
 // TODO MQTT / Stomp / MsgPack
+// FIXME high CPU use when remote goes offline
+// FIXME higher CPU use when using remote in general
 func init() {
-	// TODO add this to help text
 	opflag.StringVarP(&name, "remote-name", "", "", "Remote: name of remote gotop")
 	opflag.StringVarP(&remote_url, "remote-url", "", "", "Remote: URL of remote gotop")
 	opflag.DurationVarP(&sleep, "remote-refresh", "", 0, "Remote: Frequency to refresh data, in seconds")
diff --git a/widgets/cpu.go b/widgets/cpu.go
index 9983a10..bb72866 100644
--- a/widgets/cpu.go
+++ b/widgets/cpu.go
@@ -12,6 +12,7 @@ import (
 	ui "github.com/xxxserxxx/gotop/v4/termui"
 )
 
+// TODO Maybe group CPUs in columns if space permits
 type CPUWidget struct {
 	*ui.LineGraph
 	CPUCount        int