Merge in Ben's latest changes.