More fixes and details