Introduc m_Skip to skip ops. Clean up + fixes (nw)