refactoring, fixed lager, sasl, fink handlers