Disney material merge #1
Formatting and other small fixes.
Fixed PR comments.
Added TODO comment.
Merge pull request #470 from est77/est_disney_material

Disney material merge #1