Commit after praktikum abgabe (with some fixes)