Some improvements and added missing phrases