diff --git a/TODO.md b/TODO.md
index d91b9344d..aaad353d0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -50,7 +50,9 @@
   - will make it easier to test new services?
 
 ### upstreaming
-- add updateScripts to all my packages in nixpkgs
+- upstream `bonsaid` service -> nixpkgs
+- upstream `buffybox`/`buffyboard` package/service -> nixpkgs
+- upstream `gps-share` package -> nixpkgs
 
 #### upstreaming to non-nixpkgs repos
 - gtk: build schemas even on cross compilation: <https://github.com/NixOS/nixpkgs/pull/247844>
@@ -60,10 +62,6 @@
 
 
 ## IMPROVEMENTS:
-- replace `unl0kr` with `buffyboard` lvgl keyboard:
-  - <https://gitlab.com/postmarketOS/buffybox/-/tree/master/buffyboard>
-  - this allows richer use of the terminal on moby
-  - needs to be packaged for nix
 - mpv: add media looping controls (e.g. loop song, loop playlist)
 - curlftpfs: replace with something better
   - safer (rust? actively maintained? sandboxable?)
@@ -108,7 +106,7 @@
     - Folio is nice, uses standard markdown, though it only supports flat repos
   - OSK overlay specifically for mobile gaming
     - i.e. mock joysticks, for use with SuperTux and SuperTuxKart
-  - game: Hedgewar
+  - game: Hedgewars
 - install mobile-friendly games:
   - Shattered Pixel Dungeon (nixpkgs `shattered-pixel-dungeon`; doesn't cross-compile b/c openjdk/libIDL) <https://github.com/ebolalex/shattered-pixel-dungeon>
   - UnCiv (Civ V clone; nixpkgs `unciv`; doesn't cross-compile):  <https://github.com/yairm210/UnCiv>
@@ -132,7 +130,6 @@
   - configure geoclue to do some smoothing?
   - manually do smoothing, as some layer between mepo and geoclue?
   - email wigle.net people to unlock API access
-- moby: port `freshen-agps` timer service to s6 (maybe i want some `s6-cron` or something)
 - moby: improve gPodder launch time
 - moby: theme GTK apps (i.e. non-adwaita styles)
   - especially, make the menubar collapsible