Added some fixes & extra anchor obj