Additionally had to refactor several classes "a little bit". (Whenever one bug seemed fixed, another one appeared...)
Also removed SendEvent and simplified some other calls.