unathi doll and some fixes