Merge outstanding commits Re: changes in SIMEX and N size in matrices