merge
minor changes
profile changes, minor adjustments