Changed name of one file ("ofunctions" --> "omodel") and little changes within