p058-60 and some additions to tools