Fix grammar and merge to Andrea branch