client bugs fixed