Styles and other fixes