Copter: ACRO clean up and mistake fixes