a bunch of minor changes everywhere