wip @ saga testing + many small fixes