to unit!
some fixes. It all works now.