Refine/OC import finalization

Bug fixes, links and descriptions