fixes for OT calcs PTO calcs and others