minor improvements
merged modifications
minor updates