fixed embedded set and embedded map detection, improved otype algorigthm.