cleaning up some loose ends, and putting some of the growth of resources in a sep. thread