last opt updates and tests