refactored client info
comment fixes
sample usage