fixes in materials and other things