Fixed up Wheel class