moved pmf loading to the appropriate places for things that actually have objects