More fixes and minor editing