Spec a few more things, change over cane options a bit.