change the process of handling oPCR.

Fix some TODOs.