Some improvements to main scene