partialy works ... some bugfixes