Few comments updated.

This is a last sets of cahanges for Samples.