More fixes and additions.