Add materials and a bunch of little changes.