fixing client stuff