Updating with some updates to MC and Build