optools improvements