fixed small bugs
Changed & fixed