Fuel consumption working correctly
Minor algorithmic optimizations