Merging chase style changes into pie-chart branch

boo