Added contextmanager as ms handler, added #non.zero.rows for the ms