make some lead fields accessible; refactor client a little