changed to material names, fixes some tiny bugs