fix comments
fix logic in client's run