Bunch of bug fix