Improved command stability, test fixes