Fixing bugs with OSV3

Starting over. A lot off error.