More fixes. Testing done.