[WIP] Fixes, QOL

Wait until a build is out and tested before merging, pls.