lots of glass, small fixes