More fixes. Still many bugs