a few more changes after the fact