More factory changeovers, code cleanup, etc.