fixed small bugs
fixed bugs