Combine IKFKSwitchTool, Fix mathTool, and other changes..