client: warning and comment fixes, code clean up, refs #31