Command Bugs Fixed