Added client logic
Fixed typos