some corrections
 added changes.diff