my changes to style and other things