fixed small bugs
fixed small bugs