minor stuff
merge