small changes everywhere