Updated to latest Mirage, and multiple changes