Add in a bunch of changes per Alon's email yesterday.