Updated AimingSystem and Operator control to match master.