Changed fuel calculation to give a better estimate. Also fixed some display bugs