Merge pull request #131 from cs-24-sw-9-xx/fix-stuff

Fix random stuff

Merge branch 'main' of github.com:MalteZA/MAES into release_2.0_galactic