Updates for OptiMOS nearly complete