latest updates mostly automated cpi/mbw & wayness work