Correct scene, improve display and comment code