cleaned up confusion: not retention, but retentionpolicy
added consistent checks
minor