minor changes everywhere