more code fixes and removing CoFH From submodule