Various improvements based on inspections