Finished the Command changes. And apparently some other things?