Some fixups based on the comments, ATP still
Merge branch 'load_cardlib' into obj_render
Merged obj_render with pending branches