Update config, Fix minor merge issues w/ mpdecision make