changed minor things
merged My and JP's file changes to the materials. I added decays and JP added colors.