Made fields in state private
Pickup distance is now scaled appropriately
State is reset when setting a new map