fixed some command bugs