#15: Access material through base class.
Minor iteration fixes.