Refactored some more and fixed one or two bugs
Merge pull request #624 from duncanspumpkin/obj_list_load_refactor

Refactored some more and fixed one or two bugs