fix clitics problem and small mistakes