fixed some tiny bug