Improvements

Corrections