Sometimes good ideas come from places you least expect. On a visit to a precision engineering works in Taiwan my eldest son came across a person in the tool room using a smoke lamp, though the use of the lamp did not come with the usual not so pleasant smell. After a lot of hand gesturers he was shown a bottle but unfortunately the label was in Taiwanese so after the translation surprise surprise what was used in the smoke lamps there was Citronella Lamp and torch oil a product that is extremely common here for keeping those small flying pests at bay in the evenings here, I can really recommend its use in smoke lamps for the smell alone.
