Corrections.

Hi Pinkhas!

This pull request contains many corrections.