Some structural improvements.