fixed some problems... @Moritz: please delete all unused classes you
added to the project