add OVL,OPP locations , and some fix