more data + fuel calc. updated