fix a bit bugs.