More robust entity loading
Entities load custom materials if necessary
Code doc updates