Add Fuel and refueling. Improve navigation calculations