more enhancements responding to benallard coments

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>