fixing comments with respect to latest changes