Added Material class (empty). Minor changes to some other classes