improvements on client