Adding OPC to repo and fixing some small things