more cleanup and application of new opf
renaming the of2 to opf