More OVX implementation and notes consolidation.