IOP Lens update

Some minor fixes and 1 speedup