bug fixes to client