further bugfixes, almost funtional?