minor changes
merge fixes