touched up BarGraph style and cleaned up Waffle code