more bug fixes in the client