Add fuel & fix price calculation