Fixed Most of Commands