fixed small stuff
merge