Cleaned some code up. And fixed a merge conflict.
renamed update_positions to update_objects and make a change to the data processing