* fixed small bugs