updates for M4, cleanup