Fix small issues and add to std data
Start with fuel calc