Various changes. Also rename scale to slider.