Updates and Fixes for MACS2.