Add some modification. Correction of bugs.