move toward MARCO styles; some logic touch-up