cleanup, add material types