maybe finishe after some more fixes....