Fix cmd bug and add fun module.