fix bugs, make command