fixed command bugs