even more minor changes according to Amy's list