Reworked some of the command stuff.