Patch for fixes.

Check the text file in main directory for details.