remove conflicts
modify curry() and its related functions
small chanages for some comments