CommandMode() Corrections