Improvements

Remaining changes done.