Buddy bug fix  and others small changes