cleanup
updated defconfig
added OC & UV support