fixed small things
merged