Updates to ZMAC

This should be what you need.
maniacbug hasn't changed anything since I worked on it, so your fork is identical to what I was working on.