added yarr and fixed some bugs