add tb & some fixes (working on board)