Finished with commenting 'Client'. Also did the assigned issues.