boosted tau bug fix, and cleaning