some more work on mame side (nw)