Bugfixes, master student and still makes pointer mistakes xD