Refactor objects

I hope I haven't broken anything. Anyone wish to confirm this?
This increment is to ensure object load doesn't give up searching early. Now that we use a hashmap there is no loop so I think this could be removed. (Don't forget the respective decrement)