Improve client scripts and communication