add new mattypes and change some labels
remove unused mat types