fix little stuff
merge