Add new material and some old fixes.