minor changes
merge corrections