minor reference and error handling fixes
fixed underscore issue in new inclusions
Merge remote-tracking branch 'ethan/develop' into obj_render