Done, along with some other changes.