removed some log statements, added comments in client