some tweaks to the materials, and some geometry changes