yarmigen partially implemented & some fixes