material fixes and fixes