Comment & default val update