Improved lighter handling.