Control Command fixes and small changes