fix & feat: longstanding bugs, shit refactor#648

Inconnu1337 wants to merge 2 commits intoimperial-space:developimperial-space/SW-public:developfrom

Inconnu1337:fix-longstanding-bugsInconnu1337/SW-public-fork:fix-longstanding-bugsCopy head branch name to clipboard