fixes & improvements
compatibility with new verion of ODCS2 fixed