- started adding back multiple object support,
  as well as material support
  * minor related cleanup