Bugfixes

small fixes
Merge pull request #114 from Peda1996/master

Bugfixes
Merge pull request #115 from fabian1995/master

Improved save management and made code more efficient