some fixes & cb flag