Revert stuff because somehow this broke stuff and ugh I'm tired

This reverts commit 4a1fe712eb33cd25e89ef4e1b4a7b37911d1eef8.
actually fix delete key this time (also updates)