Added in color plus fixed some command flows