Extensive OID code enhancement and fixes.