Added OC/UC/UV support and few other changes and edits.