fix a little bugs