Comment enhancments for client

Fixes #13