some small changes in ott (specially)