fixed small stuffs