Edits made to staticCVR so it works with feeders from data store.
Additional cleanup.