Which of the following best describes the Compromise of 1850?