Adding cane and a couple cane fixes