More fixes and progress