Fixed Demo to match new Dimension class and cleaned it up a little