More work on material components; updated todo list