Updates for M2 and add'l Clean Up