Removed unnecessary command, fixed a minor bug