fixed small things #3