fix wait borow check bug & some typesetting