More tweaks to Wheel and added Wheel96