More fixes. close to ready