Bugfixes
Gonna move to a new branch after this