Code cleanup, bug fix attempts and (almost no) work on the scent burners