more glass improvements