Minor changes to Materials

Still incomplete