IVA fixes, ORS references. reorganization