several bugfixes, sample works again!