Improving output and trying to fix librarian execution
And... complete! working right!