fixed some mistake...