fixed small issues
fixed small issues