More fixes and additions