What were the details of the Great Compromise?

I believe it was when small and large States decided to have an upper and Lower house. the lower house, house of rep, was to have the number of rep. be based on population. while the upper house, the senate, was made to give all states an equal representation in the government. this being based on statehood, which earned two senators, and did not take population into account into choosing the number of senators.