more improvements to OT extension