More review changes. Better avdl with optional nulls.