fix label bug & some minor updates