Lots of dependency fixes. Also adds tag names for the code extraction