More work on styles and the like