Liquid fuels dev

Pull these two together to solve some inconsistencies