deleted material class, and some minor edits