Add a fuel can pickup.  Refactor and fix entity range/aggregation stuff.