Revert "Fixup"

This reverts commit 237b648f90b36f62b2c7e661ed51f5b09995cfae.
Revert "Revert "Fixup""

This reverts commit 8018a25daa1c188374a38dc7ef78caf112df6e17.
Fix misclicks and silly errors