fix some mistakes...