more oci8 enhancements and cleanup