even more bugfixes and loading/saving revamped