Manual merge/overwrite from tsundere branch

Since I can't seem to do this the right way
A few more messages, cleaning up TODO
Merge branch 'tsundere-electrolytes' of https://github.com/Apotrope/Tillerinobot into tsundere-electrolytes